ChangeSet
  1.2120 06/04/18 13:26:41 kent@mysql.com +1 -0
  configure.in:
    Stepped up version to 5.0.20a

  configure.in
    1.380 06/04/18 13:26:21 kent@mysql.com +1 -1
    Stepped up version to 5.0.20a

ChangeSet
  1.2117.1.1 06/04/18 12:08:06 msvensson@neptunus.(none) +13 -0
  Bug#18815 libmysql using yassl can't be linked with c program
   - Apply patch to remove dependency on C++ libs when linking "libmysql" from c

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.7 06/04/18 12:08:02 msvensson@neptunus.(none) +1 -0
    Add instantiation of one new template

  extra/yassl/taocrypt/src/integer.cpp
    1.18 06/04/18 12:08:02 msvensson@neptunus.(none) +17 -4
    Use static pointers for singletons
    Add cleanup function

  extra/yassl/taocrypt/src/algebra.cpp
    1.7 06/04/18 12:08:02 msvensson@neptunus.(none) +3 -1
    Use mySTL::vector to avoid array of Element being on the stack

  extra/yassl/taocrypt/include/runtime.hpp
    1.10 06/04/18 12:08:02 msvensson@neptunus.(none) +21 -5
    Add runtime for Solaris

  extra/yassl/taocrypt/include/misc.hpp
    1.9 06/04/18 12:08:02 msvensson@neptunus.(none) +5 -0
    Add clenaup function

  extra/yassl/taocrypt/include/integer.hpp
    1.8 06/04/18 12:08:02 msvensson@neptunus.(none) +0 -2
    Remove statoc singletons from class scope

  extra/yassl/src/yassl_int.cpp
    1.11 06/04/18 12:08:02 msvensson@neptunus.(none) +17 -5
    Use static pointers for singletons

  extra/yassl/src/template_instnt.cpp
    1.5 06/04/18 12:08:02 msvensson@neptunus.(none) +2 -0
    Add instantiation of two new templates

  extra/yassl/src/handshake.cpp
    1.6 06/04/18 12:08:02 msvensson@neptunus.(none) +10 -7
    Use buffered.reset(0) instead of null_buffer

  extra/yassl/include/yassl_types.hpp
    1.9 06/04/18 12:08:02 msvensson@neptunus.(none) +5 -0
    Add CleanUp function for static singletons

  extra/yassl/include/yassl_int.hpp
    1.7 06/04/18 12:08:02 msvensson@neptunus.(none) +0 -4
    Remove static instance

  extra/yassl/include/openssl/ssl.h
    1.5 06/04/18 12:08:02 msvensson@neptunus.(none) +1 -1
    Fix spelling error

  extra/yassl/include/openssl/rsa.h
    1.2 06/04/18 12:08:02 msvensson@neptunus.(none) +1 -1
    Fix spelling error

ChangeSet
  1.2118 06/04/18 10:16:06 serg@mysql.com +1 -0
  mysql.cc:
    revert bug#16855 "fix" per Monty's request

  client/mysql.cc
    1.199 06/04/18 10:15:22 serg@mysql.com +2 -9
    revert bug#16855 "fix" per Monty's request

ChangeSet
  1.2117 06/03/31 11:48:08 lars@mysql.com +1 -0
  BUG#18116: Changed of how mutex is handled for XA and rotating binlog

  sql/log.cc
    1.188 06/03/31 11:47:59 lars@mysql.com +5 -1
    thread_safe_increment is done as an atomic operation on some platforms
    and that does not respect the lock

ChangeSet
  1.2116 06/03/30 08:10:03 kent@mysql.com +1 -0
  btr0sea.c:
    Added BTR_CHUNK_SIZE, removed 'chunk_size' declared after declaration block

  innobase/btr/btr0sea.c
    1.40 06/03/30 08:08:44 kent@mysql.com +6 -7
    Added BTR_CHUNK_SIZE, removed 'chunk_size' declared after declaration block

ChangeSet
  1.2115 06/03/30 06:53:39 kent@mysql.com +1 -0
  

  ndb/tools/Makefile.am
    1.24 06/03/30 06:52:56 kent@mysql.com +1 -1

ChangeSet
  1.2114 06/03/29 20:58:10 konstantin@mysql.com +1 -0
  Fix an -ansi -pedantic compilation failure

ChangeSet
  1.2113 06/03/29 20:17:21 konstantin@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/opt/local/work/mysql-5.0-15683

ChangeSet
  1.2110.1.2 06/03/30 00:17:35 aivanov@mysql.com +1 -0
  Restoring changes erroneously removed by applying
   the innodb-5.0-ss368 snapshot.

  mysql-test/t/innodb.test
    1.128 06/03/30 00:17:31 aivanov@mysql.com +3 -0
    Restoring changes erroneously removed by applying
     the innodb-5.0-ss368 snapshot.

ChangeSet
  1.2106.1.1 06/03/29 23:04:32 aivanov@mysql.com +18 -0
  Applied innodb-5.0-ss368 snapshot
    Fixed bugs:
    #16814: SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section
      dict_foreign_key_error_report(): Always print a newline after invoking
      dict_print_info_on_foreign_key_in_create_format().
    #16827: Better InnoDB error message if ibdata files omitted from my.cnf.
    #17126: CHECK TABLE on InnoDB causes a short hang during check of adaptive hash.
      CHECK TABLE blocking other queries, by releasing the btr_search_latch
      periodically during the adaptive hash table validation.
    #17405: Valgrind: conditional jump or move depends on uninitialised valuesw.
      buf_block_init(): Reset magic_n, buf_fix_count, and io_fix to avoid testing
      uninitialised variables.
    #18077: InnoDB uses full explicit table locks in stored FUNCTION.
    #18238: When locks exhaust the buffer pool, InnoDB does not roll back the trx.
      Check in pessimistic insert and update if the buffer pool is exhausted by locks.
    #18252: Disk space leaks in updates of InnoDB BLOB rows.
      btr_cur_pessimistic_update(): Invoke rec_get_offset() after rec_set_field_extern_bits().
      btr_store_big_rec_extern_fields(): Note that offsets will no longer be valid
      after calling this function.
    #18283: When InnoDB returns error 'lock table full', MySQL can write to binlog too much.
    #18384: InnoDB memory leak on duplicate key errors if row has many columns.
      row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at func_exit if needed.
    #18350: Use consistent read in CREATE ... SELECT .. if innodb_locks_unsafe_for_binlog is used.

  sql/ha_innodb.cc
    1.290 06/03/29 23:04:27 aivanov@mysql.com +49 -41
    Applied innodb-5.0-ss368 snapshot
      Fix memory allocation bug (by changing MY_WME to MY_FAE) in get_share.
      Also partially fix coding style of the function.

  mysql-test/t/innodb.test
    1.127 06/03/29 23:04:27 aivanov@mysql.com +1 -3
    Applied innodb-5.0-ss368 snapshot

  innobase/row/row0upd.c
    1.42 06/03/29 23:04:27 aivanov@mysql.com +5 -0
    Applied innodb-5.0-ss368 snapshot

  innobase/row/row0sel.c
    1.106 06/03/29 23:04:27 aivanov@mysql.com +5 -5
    Applied innodb-5.0-ss368 snapshot
      Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
      page_rec_is_comp(): Remove the bounds check.
      row_sel_field_store_in_mysql_format(): Turn the assertions
      on mbminlen, mbmaxlen, and templ->type into debug assertions.

  innobase/row/row0ins.c
    1.77 06/03/29 23:04:27 aivanov@mysql.com +25 -3
    Applied innodb-5.0-ss368 snapshot

  innobase/include/univ.i
    1.46 06/03/29 23:04:27 aivanov@mysql.com +0 -4
    Applied innodb-5.0-ss368 snapshot
      Remove UNIV_RELEASES_NOT_YET_STABLE and related checks.

  innobase/include/page0page.ic
    1.16 06/03/29 23:04:27 aivanov@mysql.com +0 -13
    Applied innodb-5.0-ss368 snapshot
      Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.

  innobase/include/ha0ha.h
    1.8 06/03/29 23:04:27 aivanov@mysql.com +5 -3
    Applied innodb-5.0-ss368 snapshot

  innobase/include/buf0lru.h
    1.9 06/03/29 23:04:27 aivanov@mysql.com +2 -2
    Applied innodb-5.0-ss368 snapshot

  innobase/include/btr0cur.h
    1.16 06/03/29 23:04:27 aivanov@mysql.com +4 -1
    Applied innodb-5.0-ss368 snapshot

  innobase/ha/ha0ha.c
    1.16 06/03/29 23:04:27 aivanov@mysql.com +10 -4
    Applied innodb-5.0-ss368 snapshot

  innobase/fil/fil0fil.c
    1.64 06/03/29 23:04:27 aivanov@mysql.com +33 -17
    Applied innodb-5.0-ss368 snapshot
      fil_extend_space_to_desired_size(): in UNIV_HOTBACKUP builds,
      do not touch srv_data_file_sizes[] or srv_n_data_files.

  innobase/dict/dict0dict.c
    1.73 06/03/29 23:04:27 aivanov@mysql.com +2 -1
    Applied innodb-5.0-ss368 snapshot

  innobase/data/data0type.c
    1.22 06/03/29 23:04:27 aivanov@mysql.com +1 -1
    Applied innodb-5.0-ss368 snapshot
      dtype_print(): Fix printing of prtype.

  innobase/buf/buf0lru.c
    1.27 06/03/29 23:04:27 aivanov@mysql.com +8 -8
    Applied innodb-5.0-ss368 snapshot

  innobase/buf/buf0buf.c
    1.52 06/03/29 23:04:27 aivanov@mysql.com +5 -0
    Applied innodb-5.0-ss368 snapshot

  innobase/btr/btr0sea.c
    1.39 06/03/29 23:04:26 aivanov@mysql.com +30 -4
    Applied innodb-5.0-ss368 snapshot

  innobase/btr/btr0cur.c
    1.55 06/03/29 23:04:26 aivanov@mysql.com +8 -5
    Applied innodb-5.0-ss368 snapshot

  sql/field.h
    1.175 06/03/29 20:58:01 konstantin@mysql.com +1 -1
    Fix an -ansi -pedantic compilation failure

  sql/sql_load.cc
    1.94 06/03/29 20:17:14 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2111 06/03/29 10:56:11 cmiller@zippy.(none) +3 -0
  Reverting yesterday's patch. (cmiller:1.2099)
  

  sql/sql_load.cc
    1.93 06/03/29 10:56:08 cmiller@zippy.(none) +6 -1
    Reverting yesterday's patch. (cmiller:1.2099)

  mysql-test/t/loaddata.test
    1.18 06/03/29 10:56:08 cmiller@zippy.(none) +0 -22
    Reverting yesterday's patch. (cmiller:1.2099)

  mysql-test/r/loaddata.result
    1.23 06/03/29 10:56:07 cmiller@zippy.(none) +0 -15
    Reverting yesterday's patch. (cmiller:1.2099)

ChangeSet
  1.2110 06/03/29 15:05:06 kent@mysql.com +2 -0
  Merge

  ndb/tools/Makefile.am
    1.23 06/03/29 15:05:01 kent@mysql.com +1 -3

  sql/field.cc
    1.302 06/03/29 15:03:32 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2144.129 06/03/29 14:59:53 kent@mysql.com +1 -0
  mysql_config.sh:
    If installed, search built in lib path first, bug#13158

  scripts/mysql_config.sh
    1.23 06/03/29 14:59:29 kent@mysql.com +6 -1
    If installed, search built in lib path first, bug#13158

ChangeSet
  1.2109 06/03/29 14:18:29 kent@mysql.com +1 -0
  Makefile.am:
    Added "ndb_error_reporter" script, bug#18421

  ndb/tools/Makefile.am
    1.22 06/03/29 14:11:36 kent@mysql.com +2 -0
    Added "ndb_error_reporter" script, bug#18421

ChangeSet
  1.1616.2514.1 06/03/29 14:07:13 kent@mysql.com +1 -0
  Makefile.am:
    Install "ndb_size.pl" script and template, bug#18421

  ndb/tools/Makefile.am
    1.12.1.6 06/03/29 14:06:14 kent@mysql.com +3 -0
    Install "ndb_size.pl" script and template, bug#18421

ChangeSet
  1.2098.1.5 06/03/29 14:55:04 dlenev@mysql.com +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
  into  mysql.com:/home/dlenev/mysql-5.0-bg17764

  sql/sql_insert.cc
    1.185 06/03/29 14:54:59 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/t/trigger.test
    1.39 06/03/29 14:54:59 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/r/trigger.result
    1.34 06/03/29 14:54:58 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2081.1.1 06/03/29 14:53:00 dlenev@mysql.com +4 -0
  Proposed fix for bug #17764 "Trigger crashes MyISAM table"
  
  A table with an on insert trigger was reported as crashed when the insert
  was processed with bulk insert mode on (handler::start_bulk_insert).
  The trigger was also selecting from the same table, and that caused
  the "crash".
  The same problem was present when an insert statement, which was processed
  in bulk mode, also used a stored function that was reading the same table.
  
  This fix disables bulk inserts if a statement uses functions or invokes
  triggers. Implementing more granular checks will require much more code and
  therefore can hardly be done in 5.0

  sql/sql_load.cc
    1.91.1.1 06/03/29 14:52:56 dlenev@mysql.com +3 -2
    We should not start bulk inserts for INSERT (or similar) statement if it uses
    functions or invokes triggers since they may access to the same table and
    therefore should not see its inconsistent state created by this optimization.

  sql/sql_insert.cc
    1.183.1.1 06/03/29 14:52:56 dlenev@mysql.com +16 -7
    We should not start bulk inserts for INSERT (or similar) statement if it uses
    functions or invokes triggers since they may access to the same table and
    therefore should not see its inconsistent state created by this optimization.

  mysql-test/t/trigger.test
    1.37.1.1 06/03/29 14:52:56 dlenev@mysql.com +34 -0
    Added test bug #17764 "Trigger crashes MyISAM table".

  mysql-test/r/trigger.result
    1.32.1.1 06/03/29 14:52:56 dlenev@mysql.com +24 -0
    Added test bug #17764 "Trigger crashes MyISAM table".

ChangeSet
  1.2098.3.1 06/03/28 17:15:45 cmiller@zippy.(none) +3 -0
  Bug#11151: LOAD DATA INFILE commits transaction in 5.0
  
  No longer create or commit transactions within the loading of files.

  sql/sql_load.cc
    1.92 06/03/28 17:15:41 cmiller@zippy.(none) +1 -6
    Loading data from a table should neither create new transactions nor destroy
    (by committing or rolling-back) existing transactions.

  mysql-test/t/loaddata.test
    1.17 06/03/28 17:15:41 cmiller@zippy.(none) +22 -0
    Add test case.

  mysql-test/r/loaddata.result
    1.22 06/03/28 17:15:41 cmiller@zippy.(none) +15 -0
    Add test result.

ChangeSet
  1.2098.1.3 06/03/28 16:05:06 pem@mysql.com +1 -0
  Removed forgotten comment line in sql_select.cc.

  sql/sql_select.cc
    1.399 06/03/28 16:04:50 pem@mysql.com +0 -1
    Forgot to remove commented line in previous commit.

ChangeSet
  1.2104.1.1 06/03/28 15:40:08 jonas@perch.ndb.mysql.com +1 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  sql/ha_ndbcluster.cc
    1.240 06/03/28 15:40:04 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2144.127 06/03/28 18:32:58 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b15098

  sql/field.cc
    1.197.1.32 06/03/28 18:32:37 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2094.2.1 06/03/28 15:31:26 jonas@perch.ndb.mysql.com +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  sql/ha_ndbcluster.cc
    1.237.1.1 06/03/28 15:31:22 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2106 06/03/28 18:21:19 bar@mysql.com +1 -0
  cast.result:
    After merge fix.

  mysql-test/r/cast.result
    1.41 06/03/28 18:20:37 bar@mysql.com +8 -8
    After merge fix.

ChangeSet
  1.2098.2.1 06/03/28 15:08:17 pem@mysql.com +4 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
  into  mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime

  sql/sp.cc
    1.109 06/03/28 15:08:04 pem@mysql.com +0 -0
    Auto merged

  sql/field.h
    1.174 06/03/28 15:08:04 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp-error.test
    1.106 06/03/28 15:08:04 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/sp-error.result
    1.105 06/03/28 15:08:04 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2040.15.2 06/03/28 15:06:06 pem@mysql.com +2 -0
  Review fix for BUG#17015: Routine name truncation not an error

  sql/sp.cc
    1.108 06/03/28 15:06:00 pem@mysql.com +4 -5
    Use Field::char_length() to check number of characters in the name field.

  sql/field.h
    1.171.2.1 06/03/28 15:06:00 pem@mysql.com +6 -0
    Added new method to Field class: char_length()

ChangeSet
  1.2087.1.6 06/03/28 14:38:16 jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#17729 bug#18406
    Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
      make sure handler maps correct recattr to correct mysql column

  sql/ha_ndbcluster.cc
    1.234.1.1 06/03/28 14:38:13 jonas@perch.ndb.mysql.com +3 -1
    Make sure to map correct rec-attr against correct mysql column
      (ndbapi reorders when doing sorted scan)

  mysql-test/t/ndb_read_multi_range.test
    1.6 06/03/28 14:38:13 jonas@perch.ndb.mysql.com +38 -0
    bug#17729

  mysql-test/r/ndb_read_multi_range.result
    1.5 06/03/28 14:38:13 jonas@perch.ndb.mysql.com +104 -0
    bug#17729

ChangeSet
  1.2098.1.2 06/03/28 14:18:47 pem@mysql.com +3 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
  into  mysql.com:/extern/mysql/5.0/bug16474/mysql-5.0-runtime

  mysql-test/r/sp.result
    1.193 06/03/28 14:18:44 pem@mysql.com +16 -16
    Manual merge.

  sql/sql_select.cc
    1.398 06/03/28 14:17:16 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.181 06/03/28 14:17:15 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2073.2.2 06/03/28 14:16:21 pem@mysql.com +5 -0
  Post review fixes for BUG#16474: SP crashed MySQL.

  sql/sql_select.cc
    1.397 06/03/28 14:16:17 pem@mysql.com +3 -2
    Fixed comment and test for basic_const_item() instead of is_splocal().

  mysql-test/t/sp.test
    1.178.1.2 06/03/28 14:16:17 pem@mysql.com +5 -0
    Added reference to test case for BUG#16474.

  mysql-test/t/ps.test
    1.60 06/03/28 14:16:17 pem@mysql.com +34 -0
    Added test coverage for "order by" in prepared statements (related to BUG#16474).

  mysql-test/r/sp.result
    1.190.1.2 06/03/28 14:16:17 pem@mysql.com +6 -0
    Added reference to test case for BUG#16474.

  mysql-test/r/ps.result
    1.62 06/03/28 14:16:16 pem@mysql.com +46 -0
    Added test coverage for "order by" in prepared statements (related to BUG#16474).

ChangeSet
  1.2105 06/03/28 17:07:26 bar@mysql.com +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b15098
  into  mysql.com:/usr/home/bar/mysql-5.0
  Bug#15098

  sql/field.cc
    1.301 06/03/28 17:07:19 bar@mysql.com +0 -0
    After merge fix

  mysql-test/r/cast.result
    1.40 06/03/28 17:07:19 bar@mysql.com +8 -8
    After merge fix

  mysql-test/t/cast.test
    1.30 06/03/28 17:04:31 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2098.1.1 06/03/28 15:06:29 konstantin@mysql.com +3 -0
  A fix and a test case for Bug#15683 "crash, Function on nested 
  VIEWs, Prepared statement": we didn't mark the nested views
  as 'prelockng placeholders' when building the prelocking list. 
  This resulted in these views being processed (merged, materialized)
  before they are actually used. 

  sql/sql_view.cc
    1.84 06/03/28 15:06:18 konstantin@mysql.com +1 -0
    When initializing tables used in a view, inherite 
    its 'prelocking_placeholder' flag. This flag is set when we're 
    opening the view in order to build the prelocking list for a query.
    In this case we should only calculate the list to 
    prelock, and should not merge neither this view nor any of the 
    nested views, of there are any. The flag is used to indicate this 
    mode.

  mysql-test/t/sp-prelocking.test
    1.4 06/03/28 15:06:17 konstantin@mysql.com +31 -0
    Add a test case for Bug#15683

  mysql-test/r/sp-prelocking.result
    1.4 06/03/28 15:06:17 konstantin@mysql.com +23 -0
    Test results fixed (Bug#15683)

ChangeSet
  1.2104 06/03/28 11:46:35 mskold@mysql.com +1 -0
  Post review fix for Bug #15722  Engine_condition_pushdown fails when using blobs(text)

  sql/ha_ndbcluster.cc
    1.239 06/03/28 11:46:24 mskold@mysql.com +2 -0
    Post review fix for Bug #15722  Engine_condition_pushdown fails when using blobs(text)

ChangeSet
  1.2103 06/03/28 10:01:23 mskold@mysql.com +2 -0
  Added tests with IGNORE and NULL values

  mysql-test/t/ndb_insert.test
    1.12 06/03/28 10:01:10 mskold@mysql.com +8 -0
    Added tests with IGNORE and NULL values

  mysql-test/r/ndb_insert.result
    1.10 06/03/28 10:01:10 mskold@mysql.com +16 -0
    Added tests with IGNORE and NULL values

ChangeSet
  1.2102 06/03/28 09:59:20 mskold@mysql.com +3 -0
  Fix for Bug #15722  Engine_condition_pushdown fails when using blobs(text)

  sql/ha_ndbcluster.cc
    1.238 06/03/28 09:58:49 mskold@mysql.com +4 -1
    Fix for Bug #15722  Engine_condition_pushdown fails when using blobs(text)

  mysql-test/t/ndb_condition_pushdown.test
    1.16 06/03/28 09:58:49 mskold@mysql.com +11 -1
    Fix for Bug #15722  Engine_condition_pushdown fails when using blobs(text)

  mysql-test/r/ndb_condition_pushdown.result
    1.17 06/03/28 09:58:49 mskold@mysql.com +17 -1
    Fix for Bug #15722  Engine_condition_pushdown fails when using blobs(text)

ChangeSet
  1.2097.2.1 06/03/27 18:28:55 igor@rurik.mysql.com +3 -0
  Fixed bug #18386.
  An invalid assertion in Item_direct_view_ref::eq caused 
  an assertion abort in the debug version.

  sql/item.cc
    1.210 06/03/27 18:28:49 igor@rurik.mysql.com +4 -7
    Fixed bug #18386.
    An invalid assertion in Item_direct_view_ref::eq caused 
    an assertion abort in the debug version.
    Changed the assertion.

  mysql-test/t/view.test
    1.138 06/03/27 18:28:49 igor@rurik.mysql.com +14 -0
    Added a test case for bug #18386.

  mysql-test/r/view.result
    1.149 06/03/27 18:28:49 igor@rurik.mysql.com +9 -0
    Added a test case for bug #18386.

ChangeSet
  1.2096.1.2 06/03/27 18:25:35 ian@zim.(none) +2 -0
  Disable udf test

  mysql-test/t/disabled.def
    1.24 06/03/27 18:25:30 ian@zim.(none) +1 -0
    Disable the udf test, per bug #18564. Permission by Brian

  BitKeeper/etc/ignore
    1.218 06/03/27 18:25:30 ian@zim.(none) +1 -0
    Added mysql-test/r/udf.log to the ignore list

ChangeSet
  1.2096.1.1 06/03/27 17:45:06 ian@zim.(none) +2 -0
  Fix for bug #16855

  client/mysql.cc
    1.198 06/03/27 17:45:01 ian@zim.(none) +9 -2
    If --socket is not set, provides --protocol=TCP when --port=
    is specified (and --protocol= is not specified.)

  BitKeeper/etc/ignore
    1.217 06/03/27 17:45:01 ian@zim.(none) +2 -0
    Added mysql-test/r/bdb.log mysql-test/r/im_client_port.log to the ignore list

ChangeSet
  1.1616.2144.126 06/03/27 23:04:44 kent@mysql.com +1 -0
  mysql_config.sh:
    Remove Solaris -xc99=none C option as C++ compiler can't handle it

  scripts/mysql_config.sh
    1.22 06/03/27 23:04:21 kent@mysql.com +1 -1
    Remove Solaris -xc99=none C option as C++ compiler can't handle it

ChangeSet
  1.2098 06/03/28 01:01:51 anozdrin@mysql.com +3 -0
  Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
  in older version.
  
  The problem is that TRN-files created in "old" versions contain
  junk in trigger_table field, which is not acceptable in "new" versions.

  sql/sql_trigger.cc
    1.49 06/03/28 01:01:48 anozdrin@mysql.com +61 -7
    1. Polishing
    2. Removed declaration of global handle_old_incorrect_sql_modes()
       since it is not used anymore.
    3. Added a hook to support invalid "trigger_table" field in TRN-file
       from old versions.

  sql/parse_file.h
    1.12 06/03/28 01:01:47 anozdrin@mysql.com +3 -0
    Made parse_escaped_string() available globally.

  sql/parse_file.cc
    1.20 06/03/28 01:01:47 anozdrin@mysql.com +3 -3
    1. Made parse_escaped_string() available globally;
    2. Polishing: fixing the comments.

ChangeSet
  1.1616.2144.125 06/03/27 19:25:25 kent@mysql.com +1 -0
  mysql_config.sh:
    We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322

  scripts/mysql_config.sh
    1.21 06/03/27 19:17:54 kent@mysql.com +19 -8
    We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322

ChangeSet
  1.2086.22.1 06/03/27 13:16:53 pekka@mysql.com +1 -0
  ndb - bug#17380: Missing charset causes NDB Client to crash

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.85 06/03/27 13:15:38 pekka@mysql.com +2 -1
    check parseTableInfo return value to avoid coredump
    seen on solaris when charsets missing on client host

ChangeSet
  1.2086.21.1 06/03/27 12:20:25 gkodinov@mysql.com +2 -0
  Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
    Reproduced in 5.0.16-nt. Tested to work in 5.0.20
    

  mysql-test/t/group_min_max.test
    1.19 06/03/27 12:20:17 gkodinov@mysql.com +38 -0
    Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
      Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20

  mysql-test/r/group_min_max.result
    1.21 06/03/27 12:20:16 gkodinov@mysql.com +37 -0
    Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
      Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20

ChangeSet
  1.2086.20.1 06/03/27 12:02:23 monty@mysql.com +2 -0
  Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
  
  This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
  library

  sql-common/client.c
    1.86 06/03/27 12:02:20 monty@mysql.com +0 -6
    Safer fix for Bug #18435

  include/mysql.h
    1.156 06/03/27 12:02:20 monty@mysql.com +2 -0
    Safer fix for Bug #18435

ChangeSet
  1.2087.1.5 06/03/27 10:21:52 jonas@perch.ndb.mysql.com +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/test/src/NdbRestarts.cpp
    1.6 06/03/27 10:21:49 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/test/src/NdbBackup.cpp
    1.26 06/03/27 10:21:49 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/test/ndbapi/testNodeRestart.cpp
    1.20 06/03/27 10:21:49 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.23 06/03/27 10:21:49 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2512.11 06/03/27 10:18:48 jonas@perch.ndb.mysql.com +4 -0
  ndb - autotest
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/test/src/NdbRestarts.cpp
    1.3.1.2 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +8 -8
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/test/src/NdbBackup.cpp
    1.19.1.5 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +2 -2
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.9 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +12 -0
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.15.1.4 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +15 -2
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

ChangeSet
  1.2086.1.28 06/03/26 21:19:43 bpontz@shasta.mysql.com +1 -0
  added option for netware build

  netware/BUILD/compile-netware-START
    1.6 06/03/26 21:19:38 bpontz@shasta.mysql.com +1 -1
    added option for netware builds

ChangeSet
  1.2086.19.1 06/03/24 12:44:54 igor@rurik.mysql.com +3 -0
  Fixed bug #17164.
  If the WHERE condition of a query contained an ORed FALSE term
  then the set of tables whose rows cannot serve for null complements
  in outer joins was determined incorrectly. It resulted in blocking 
  possible conversions of outer joins into joins for such queries.

  sql/item_cmpfunc.cc
    1.195 06/03/24 12:44:49 igor@rurik.mysql.com +7 -4
    Fixed bug #17164.
    If the WHERE condition of a query contained an ORed FALSE term
    then the set of tables whose rows cannot serve for null complements
    in outer joins was determined incorrectly. It resulted in blocking 
    possible conversions of outer joins into joins for such queries. 

  mysql-test/t/join_outer.test
    1.35 06/03/24 12:44:48 igor@rurik.mysql.com +20 -0
    Added a test case for bug #17164.

  mysql-test/r/join_outer.result
    1.46 06/03/24 12:44:48 igor@rurik.mysql.com +19 -0
    Added a test case for bug #17164.

ChangeSet
  1.2086.1.26 06/03/24 22:46:33 dlenev@mysql.com +1 -0
  Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional
  tables corrupt triggers".
  
  It turned out that we also have relied at certain places that
  (new_table != table_name) were always true on Windows and for transactional
  tables. Since our fix for the bug brakes this assumption we have to add new
  flag to pass this information around.
  This code needs to be refactored but I dare not to do this in 5.0.

  sql/sql_table.cc
    1.300 06/03/24 22:46:29 dlenev@mysql.com +3 -1
    mysql_alter_table():
      Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on
      transactional tables corrupt triggers". It turned out that we also have
      relied at certain places that (new_table != table_name) were always true
      on Windows and for transactional tables. Since our fix for the bug brakes
      this assumption we have to add new flag to pass this information around.
      This code needs to be refactored but I dare not to do this in 5.0.

ChangeSet
  1.2090 06/03/24 14:21:45 jonas@perch.ndb.mysql.com +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  sql/ha_innodb.cc
    1.289 06/03/24 14:21:41 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.48 06/03/24 14:21:41 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_timer.pl
    1.8 06/03/24 14:21:41 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2086.17.1 06/03/24 14:58:18 dlenev@mysql.com +6 -0
  Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt
  triggers".
  
  Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
  table of any type on Windows caused disappearance of its triggers.
  Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
  keep info of triggers" (see comment for sql_table.cc for more info).
  .

  mysql-test/t/trigger-trans.test
    1.1 06/03/24 14:58:13 dlenev@mysql.com +52 -0
    New BitKeeper file ``mysql-test/t/trigger-trans.test''

  mysql-test/r/trigger-trans.result
    1.1 06/03/24 14:58:13 dlenev@mysql.com +84 -0
    New BitKeeper file ``mysql-test/r/trigger-trans.result''

  sql/sql_trigger.cc
    1.48 06/03/24 14:58:13 dlenev@mysql.com +4 -0
    Table_triggers_list::change_table_name():
      Mentioned assumption that subject table is not renamed to itself in method
      description. Added DBUG_ASSERT() to catch wrong usage of this method.

  sql/sql_table.cc
    1.299 06/03/24 14:58:13 dlenev@mysql.com +0 -1
    mysql_alter_table():
      Removal of strdup() which is no longer necessary allows us to preserve
      nice assumption that "(new_db != db || new_table != table_name) indicates
      that table will be renamed. So now we really can use this condition to
      avoid updating trigger definitions when table is not renamed.
      Note that we can't use (alter_info->flags & ALTER_RENAME) condition instead
      since it can be also true when we do "ALTER TABLE t1 RENAME TO t1".

  mysql-test/t/trigger.test
    1.38 06/03/24 14:58:13 dlenev@mysql.com +23 -0
    Added test-case covering handling of triggers when one does ALTER TABLE which
    should move table to different database.

  mysql-test/t/trigger-trans.test
    1.0 06/03/24 14:58:13 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/mysql-5.0-bg18153/mysql-test/t/trigger-trans.test

  mysql-test/r/trigger.result
    1.33 06/03/24 14:58:13 dlenev@mysql.com +31 -0
    Added test-case covering handling of triggers when one does ALTER TABLE which
    should move table to different database.

  mysql-test/r/trigger-trans.result
    1.0 06/03/24 14:58:13 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/mysql-5.0-bg18153/mysql-test/r/trigger-trans.result

ChangeSet
  1.2086.16.1 06/03/24 11:12:32 msvensson@devsrv-b.mysql.com +1 -0
  Fix 'metaphon' function to correctly calculate the length of the returned string

  sql/udf_example.cc
    1.22 06/03/24 11:12:19 msvensson@devsrv-b.mysql.com +1 -1
    Calculate length of returned string correctly

ChangeSet
  1.2086.13.6 06/03/24 10:45:00 mskold@mysql.com +1 -0
  If doing write, then peeking is not needed

  sql/ha_ndbcluster.cc
    1.237 06/03/24 10:44:23 mskold@mysql.com +1 -1
    If doing write, then peeking is not needed

ChangeSet
  1.2086.1.22 06/03/23 22:29:53 msvensson@shellback.(none) +1 -0
  Only run in libtool if running in valgrind.
  Apparently libtool isn't properly setup on all our build hosts.

  mysql-test/mysql-test-run.pl
    1.83 06/03/23 22:29:47 msvensson@shellback.(none) +2 -1
    Only run in libtool if running in valgrind. 

ChangeSet
  1.2086.15.1 06/03/23 21:48:31 msvensson@shellback.(none) +2 -0
  Dump result to .log file at test failure

  mysql-test/lib/mtr_report.pl
    1.21 06/03/23 21:48:27 msvensson@shellback.(none) +9 -1
    Inform about the <testname>.log file's existence

  client/mysqltest.c
    1.230 06/03/23 21:48:26 msvensson@shellback.(none) +9 -2
    Dump accumulated result upuntil test failure into a <testname>.log file for later examination

ChangeSet
  1.2086.1.20 06/03/23 21:45:00 msvensson@devsrv-b.mysql.com +1 -0
  Remove DBUG print that looks at args[0]  even if arg_count is 0

  sql/item_func.cc
    1.276 06/03/23 21:44:54 msvensson@devsrv-b.mysql.com +0 -3
    Remove DBUG print that looks at args[0]  even if arg_count is 0

ChangeSet
  1.2086.1.19 06/03/23 20:59:23 msvensson@shellback.(none) +1 -0
  Fix type "enfif" -> "endif"

  include/config-win.h
    1.78 06/03/23 20:59:17 msvensson@shellback.(none) +1 -1
    Fix type "enfif" -> "endif"

ChangeSet
  1.2086.1.18 06/03/23 20:05:09 msvensson@shellback.(none) +1 -0
  Delete gdbinit file before writing to it
  Concat type+idx to get a unique gdbinit filename

  mysql-test/mysql-test-run.pl
    1.82 06/03/23 20:05:02 msvensson@shellback.(none) +10 -4
    Delete gdbinit file before writing to it
    Concat type+idx to get a unique gdbinit filename

ChangeSet
  1.2086.1.17 06/03/23 18:58:53 msvensson@shellback.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/mysql-test-run.pl
    1.81 06/03/23 18:58:47 msvensson@shellback.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.229 06/03/23 18:58:47 msvensson@shellback.(none) +0 -0
    Auto merged

ChangeSet
  1.2086.5.14 06/03/23 17:41:53 kent@mysql.com +6 -0
  Merge

  include/config-win.h
    1.77 06/03/23 17:41:48 kent@mysql.com +0 -0
    SCCS merged

  strings/ctype-ucs2.c
    1.60 06/03/23 17:32:04 kent@mysql.com +0 -0
    Auto merged

  strings/ctype-gb2312.c
    1.64 06/03/23 17:32:04 kent@mysql.com +0 -0
    Auto merged

  strings/ctype-euc_kr.c
    1.67 06/03/23 17:32:03 kent@mysql.com +0 -0
    Auto merged

  strings/ctype-bin.c
    1.69 06/03/23 17:32:03 kent@mysql.com +0 -0
    Auto merged

  include/m_ctype.h
    1.119 06/03/23 17:32:02 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2144.123 06/03/23 17:25:49 kent@mysql.com +1 -0
  config-win.h:
    If CYBOZU defined, set character sets etc

  include/config-win.h
    1.48.1.9 06/03/23 17:19:46 kent@mysql.com +15 -0
    If CYBOZU defined, set character sets etc

ChangeSet
  1.2086.1.16 06/03/23 16:41:29 msvensson@shellback.(none) +1 -0
  Remove unused option "verbose"

  mysql-test/mysql-test-run.pl
    1.78.1.4 06/03/23 16:41:24 msvensson@shellback.(none) +0 -4
    Remove unused option "verbose"

ChangeSet
  1.2086.1.15 06/03/23 16:39:51 msvensson@shellback.(none) +1 -0
  Moved "tmpdir" and 2vardor" to the documented flags and add some documentation

  mysql-test/mysql-test-run.pl
    1.78.1.3 06/03/23 16:39:46 msvensson@shellback.(none) +11 -3
    Moved "tmpdir" and 2vardor" to the documented flags and add some documentation

ChangeSet
  1.2086.1.14 06/03/23 16:22:56 msvensson@shellback.(none) +1 -0
  Add support fo --manual-debug, --manual-gdb and -manual-ddd
  Touchups

  mysql-test/mysql-test-run.pl
    1.78.1.2 06/03/23 16:22:50 msvensson@shellback.(none) +56 -22
    Add support fo --manual-debug, --manual-gdb and -manual-ddd

ChangeSet
  1.2086.1.13 06/03/23 16:21:20 msvensson@shellback.(none) +1 -0
  Update after merge, function renamed

  client/mysqltest.c
    1.227.1.2 06/03/23 16:21:15 msvensson@shellback.(none) +1 -4
    Update after merge, function renamed

ChangeSet
  1.2087.1.4 06/03/23 15:47:01 jonas@perch.ndb.mysql.com +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/test/run-test/daily-basic-tests.txt
    1.36 06/03/23 15:46:57 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/test/ndbapi/testNodeRestart.cpp
    1.19 06/03/23 15:46:57 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.86 06/03/23 15:46:57 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.17 06/03/23 15:46:57 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2512.10 06/03/23 15:33:40 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    remove bug#18385 from autotest as it only works on 2 node clusters

  ndb/test/run-test/daily-basic-tests.txt
    1.13.2.9 06/03/23 15:33:38 jonas@perch.ndb.mysql.com +4 -4
    remove bug#18385 as it only works on 2 node clusters

ChangeSet
  1.2086.1.12 06/03/23 15:30:21 msvensson@shellback.(none) +2 -0
  Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/mysql-test-run.pl
    1.78.1.1 06/03/23 15:30:17 msvensson@shellback.(none) +17 -17
    Merge

  client/mysqltest.c
    1.227.1.1 06/03/23 15:24:55 msvensson@shellback.(none) +0 -0
    Auto merged

ChangeSet
  1.2086.13.5 06/03/23 15:20:24 mskold@mysql.com +1 -0
  Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted', shared locking is sufficient

  sql/ha_ndbcluster.cc
    1.236 06/03/23 15:19:21 mskold@mysql.com +1 -2
    Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transacti

ChangeSet
  1.2086.13.4 06/03/23 15:18:02 mskold@mysql.com +1 -0
  Post-review fix 2

  ndb/src/ndbapi/NdbTransaction.cpp
    1.46.1.2 06/03/23 15:17:22 mskold@mysql.com +2 -0
    Post-review fix 2

ChangeSet
  1.2086.14.1 06/03/23 18:09:35 ramil@mysql.com +3 -0
  Fix for bug #18306: MySQL crashes and restarts using subquery

  sql/opt_range.cc
    1.206 06/03/23 18:09:27 ramil@mysql.com +12 -3
    Fix for bug #18306: MySQL crashes and restarts using subquery
    Restore thd->mem_root because
    during the cond->val_int() evaluation we can come across a subselect 
    item which may allocate memory on the thd->mem_root and assumes
    all the memory allocated has the same life span as the subselect
    item itself.

  mysql-test/t/subselect.test
    1.116 06/03/23 18:09:27 ramil@mysql.com +11 -0
    Fix for bug #18306: MySQL crashes and restarts using subquery
    test case

  mysql-test/r/subselect.result
    1.137 06/03/23 18:09:27 ramil@mysql.com +6 -0
    Fix for bug #18306: MySQL crashes and restarts using subquery
    test case

ChangeSet
  1.1616.2513.2 06/03/23 15:07:39 msvensson@shellback.(none) +1 -0
  mysql-test-run.pl
  Add support for debuggers and impove support for valgrind

  mysql-test/mysql-test-run.pl
    1.8.8.7 06/03/23 15:07:36 msvensson@shellback.(none) +211 -85
    Add support for debuggers and improve support for valgrind

ChangeSet
  1.1616.2513.1 06/03/23 15:04:46 msvensson@shellback.(none) +1 -0
  Dump reject file before mysqltest in 'die'
  Makes it easier to see what happened before the failure

  client/mysqltest.c
    1.92.20.7 06/03/23 15:04:41 msvensson@shellback.(none) +11 -0
    Dump reject file before mysqltest in 'die'

ChangeSet
  1.2086.13.3 06/03/23 14:45:52 mskold@mysql.com +1 -0
  Post-review fix

  ndb/src/ndbapi/NdbTransaction.cpp
    1.46.1.1 06/03/23 14:44:34 mskold@mysql.com +2 -0
    Post-review fix

ChangeSet
  1.1616.2512.9 06/03/23 11:53:54 jonas@perch.ndb.mysql.com +3 -0
  ndb -
    minor fixes in test programs

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.8 06/03/23 11:53:53 jonas@perch.ndb.mysql.com +8 -0
    Fix test program

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.1.23 06/03/23 11:53:53 jonas@perch.ndb.mysql.com +1 -1
    Fix conflicting error codes

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.8.1.8 06/03/23 11:53:52 jonas@perch.ndb.mysql.com +1 -1
    Fix conflicting error codes

ChangeSet
  1.1616.2144.122 06/03/23 14:29:43 bar@mysql.com +5 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b15376

  strings/ctype-ucs2.c
    1.33.1.14 06/03/23 14:29:28 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-gb2312.c
    1.56.1.3 06/03/23 14:29:27 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-euc_kr.c
    1.59.1.3 06/03/23 14:29:27 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-bin.c
    1.54.1.6 06/03/23 14:29:26 bar@mysql.com +0 -0
    Auto merged

  include/m_ctype.h
    1.102.1.5 06/03/23 14:29:26 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2086.12.5 06/03/23 14:17:48 bar@mysql.com +1 -0
  m_ctype.h:
    Bug##15376
    After merge fix: removing redundant macros.

  include/m_ctype.h
    1.118 06/03/23 14:16:41 bar@mysql.com +0 -3
    Bug##15376
    After merge fix: removing redundant macros.

ChangeSet
  1.2086.12.4 06/03/23 14:03:39 bar@mysql.com +5 -0
  Bug#15376: Unassigned multibyte codes are converted to U+0000
  Mergeing changes into 5.0

  strings/ctype-eucjpms.c
    1.13 06/03/23 14:03:32 bar@mysql.com +13 -13
    Applying changes to eucjpms, similar to ujis.
    Note: eucjpms appeared in 5.0 so the original patch,
    which was for for 4.1, didn't fix eucjpms.

  strings/ctype-cp932.c
    1.12 06/03/23 14:03:32 bar@mysql.com +3 -3
    After merge fix

  mysql-test/t/ctype_eucjpms.test
    1.9 06/03/23 14:03:31 bar@mysql.com +17 -0
    Adding test

  mysql-test/r/ctype_ujis.result
    1.18 06/03/23 14:03:31 bar@mysql.com +6 -6
    After merge fix

  mysql-test/r/ctype_eucjpms.result
    1.6 06/03/23 14:03:31 bar@mysql.com +6 -0
    Adding test

ChangeSet
  1.2086.12.3 06/03/23 13:05:13 bar@mysql.com +1 -0
  m_ctype.h:
    Removing duplicate old definition.
    After merge fix for bug#15375

  include/m_ctype.h
    1.117 06/03/23 13:04:06 bar@mysql.com +0 -1
    Removing duplicate old definition.
    After merge fix for bug#15375

ChangeSet
  1.2086.13.2 06/03/23 09:57:58 mskold@mysql.com +6 -0
  Added type tags to operations

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.68 06/03/23 09:57:45 mskold@mysql.com +3 -3
    Added type tags to operations

  ndb/src/ndbapi/NdbOperation.cpp
    1.16 06/03/23 09:57:45 mskold@mysql.com +2 -1
    Added type tags to operations

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.25 06/03/23 09:57:45 mskold@mysql.com +7 -1
    Added type tags to operations

  ndb/include/ndbapi/NdbScanOperation.hpp
    1.33 06/03/23 09:57:45 mskold@mysql.com +2 -1
    Added type tags to operations

  ndb/include/ndbapi/NdbOperation.hpp
    1.33 06/03/23 09:57:45 mskold@mysql.com +45 -2
    Added type tags to operations

  ndb/include/ndbapi/NdbIndexOperation.hpp
    1.11 06/03/23 09:57:45 mskold@mysql.com +5 -0
    Added type tags to operations

ChangeSet
  1.2086.13.1 06/03/23 09:48:46 mskold@mysql.com +6 -0
  Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'

  sql/ha_ndbcluster.h
    1.96 06/03/23 09:48:24 mskold@mysql.com +8 -1
    Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'

  sql/ha_ndbcluster.cc
    1.235 06/03/23 09:48:24 mskold@mysql.com +163 -28
    Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'

  mysql-test/t/ndb_replace.test
    1.5 06/03/23 09:48:24 mskold@mysql.com +11 -0
    Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'

  mysql-test/t/ndb_insert.test
    1.11 06/03/23 09:48:24 mskold@mysql.com +14 -9
    Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'

  mysql-test/r/ndb_replace.result
    1.4 06/03/23 09:48:24 mskold@mysql.com +12 -0
    Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'

  mysql-test/r/ndb_insert.result
    1.9 06/03/23 09:48:24 mskold@mysql.com +27 -1
    Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted'

ChangeSet
  1.2086.12.2 06/03/23 12:41:28 bar@mysql.com +17 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
  into  mysql.com:/usr/home/bar/mysql-5.0

  mysql-test/r/ctype_ujis.result
    1.17 06/03/23 12:41:15 bar@mysql.com +6 -6
    After merge fix

  include/m_ctype.h
    1.116 06/03/23 12:40:36 bar@mysql.com +5 -0
    After merge fix.

  strings/ctype-utf8.c
    1.98 06/03/23 12:37:51 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-ujis.c
    1.70 06/03/23 12:37:51 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-ucs2.c
    1.59 06/03/23 12:37:51 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-tis620.c
    1.92 06/03/23 12:37:50 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-sjis.c
    1.89 06/03/23 12:37:50 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-simple.c
    1.76 06/03/23 12:37:50 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-latin1.c
    1.49 06/03/23 12:37:50 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-gbk.c
    1.79 06/03/23 12:37:50 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-gb2312.c
    1.63 06/03/23 12:37:50 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-euc_kr.c
    1.66 06/03/23 12:37:49 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-bin.c
    1.68 06/03/23 12:37:49 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-big5.c
    1.89 06/03/23 12:37:49 bar@mysql.com +0 -0
    Auto merged

  sql/sql_string.cc
    1.91 06/03/23 12:37:49 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_ujis.test
    1.18 06/03/23 12:37:49 bar@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype-cp932.c
    1.11 06/03/23 12:37:49 bar@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype-cp932.c
    1.1.8.2 06/03/23 12:37:48 bar@mysql.com +0 -0
    Merge rename: strings/ctype-cp932.c -> BitKeeper/deleted/.del-ctype-cp932.c

ChangeSet
  1.2086.5.10 06/03/23 09:19:01 lars@mysql.com +1 -0
  New file to remove sleeps in mysql-test-run (backported from 5.1)

ChangeSet
  1.2086.10.3 06/03/23 12:15:13 bar@mysql.com +1 -0
  ctype-czech.c:
    Fixing wrong min_sort_char.

  strings/ctype-czech.c
    1.63 06/03/23 12:10:02 bar@mysql.com +1 -1
    Fixing wrong min_sort_char.

  mysql-test/include/wait_slave_status.inc
    1.1 06/03/23 09:07:52 lars@mysql.com +158 -0

  mysql-test/include/wait_slave_status.inc
    1.0 06/03/23 09:07:52 lars@mysql.com +0 -0
    BitKeeper file /users/lthalmann/bk/mysql-5.0/mysql-test/include/wait_slave_status.inc

ChangeSet
  1.2086.5.8 06/03/23 08:21:16 msvensson@neptunus.(none) +1 -0
  Move the replcae result to before the correct select

  mysql-test/t/type_newdecimal.test
    1.36 06/03/23 08:21:12 msvensson@neptunus.(none) +6 -7
    Move the replcae result to before the correct select

ChangeSet
  1.2086.11.1 06/03/23 10:17:31 bar@mysql.com +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b17374
  into  mysql.com:/usr/home/bar/mysql-5.0

  strings/ctype-czech.c
    1.62 06/03/23 10:17:22 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-bin.c
    1.67 06/03/23 10:17:22 bar@mysql.com +0 -0
    Auto merged

  include/m_ctype.h
    1.115 06/03/23 10:17:22 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2086.10.1 06/03/23 00:37:40 monty@mysql.com +1 -0
  Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and
  5.0.18 by not reseting or accessing the info_buffer member

  sql-common/client.c
    1.85 06/03/23 00:33:43 monty@mysql.com +11 -2
    Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and
    5.0.18 by not reseting or accessing the info_buffer member

ChangeSet
  1.2086.5.7 06/03/22 22:37:32 msvensson@neptunus.(none) +1 -0
  Fix unused variable warning

  sql/parse_file.cc
    1.19 06/03/22 22:37:28 msvensson@neptunus.(none) +0 -1
    Remove unused variable

ChangeSet
  1.2086.5.6 06/03/22 22:34:48 msvensson@neptunus.(none) +1 -0
  Save core files before removing the data_dir

  mysql-test/mysql-test-run.pl
    1.80 06/03/22 22:34:43 msvensson@neptunus.(none) +24 -2
    Save core files before removing the data_dir

ChangeSet
  1.2086.9.2 06/03/22 16:47:45 msvensson@neptunus.(none) +3 -0
  Fix windows results using "replace_result"

  mysql-test/t/variables.test
    1.55 06/03/22 16:47:41 msvensson@neptunus.(none) +2 -0
    Fix windows results using "replace_result"

  mysql-test/t/type_newdecimal.test
    1.35 06/03/22 16:47:41 msvensson@neptunus.(none) +11 -0
    Fix windows results using "replace_result"

  mysql-test/t/type_float.test
    1.30 06/03/22 16:47:41 msvensson@neptunus.(none) +5 -0
    Fix windows results using "replace_result"

ChangeSet
  1.2087.1.3 06/03/22 15:46:51 jonas@perch.ndb.mysql.com +5 -0
  ndb -
    post merge fixes

  ndb/tools/desc.cpp
    1.20 06/03/22 15:46:49 jonas@perch.ndb.mysql.com +4 -4
    post merge 

  ndb/src/kernel/error/ndbd_exit_codes.c
    1.9 06/03/22 15:46:49 jonas@perch.ndb.mysql.com +3 -0
    post merge 

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.85 06/03/22 15:46:48 jonas@perch.ndb.mysql.com +0 -1
    post merge 

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.45 06/03/22 15:46:48 jonas@perch.ndb.mysql.com +1 -1
    post merge 

  ndb/include/mgmapi/ndbd_exit_codes.h
    1.9 06/03/22 15:46:48 jonas@perch.ndb.mysql.com +0 -2
    post merge 

ChangeSet
  1.2087.1.2 06/03/22 15:24:32 jonas@perch.ndb.mysql.com +19 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/tools/desc.cpp
    1.19 06/03/22 15:24:29 jonas@perch.ndb.mysql.com +1 -0
    merge

  ndb/test/run-test/daily-basic-tests.txt
    1.35 06/03/22 15:24:29 jonas@perch.ndb.mysql.com +2 -6
    merge

  ndb/test/ndbapi/testTimeout.cpp
    1.13 06/03/22 15:24:29 jonas@perch.ndb.mysql.com +0 -5
    merge

  ndb/src/ndbapi/TransporterFacade.cpp
    1.42 06/03/22 15:24:29 jonas@perch.ndb.mysql.com +0 -0
    merge

  ndb/src/ndbapi/Ndbif.cpp
    1.31 06/03/22 15:24:29 jonas@perch.ndb.mysql.com +1 -2
    merge

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.90 06/03/22 15:24:29 jonas@perch.ndb.mysql.com +0 -2
    merge

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.84 06/03/22 15:24:29 jonas@perch.ndb.mysql.com +18 -17
    merge

  sql/ha_innodb.cc
    1.286.2.1 06/03/22 15:10:35 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/test/src/NdbRestarter.cpp
    1.12 06/03/22 15:10:35 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/test/run-test/Makefile.am
    1.23 06/03/22 15:10:35 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/test/ndbapi/testNodeRestart.cpp
    1.18 06/03/22 15:10:35 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/TransporterFacade.hpp
    1.25 06/03/22 15:10:35 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.47 06/03/22 15:10:35 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.24 06/03/22 15:10:35 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.30.6.2 06/03/22 15:10:34 jonas@perch.ndb.mysql.com +0 -0
    Merge rename: ndb/src/ndbapi/NdbConnection.cpp -> ndb/src/ndbapi/NdbTransaction.cpp

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.33 06/03/22 15:10:34 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.44 06/03/22 15:10:34 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.10 06/03/22 15:10:34 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.16 06/03/22 15:10:34 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_timer.pl
    1.6.1.1 06/03/22 15:10:34 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2087.1.1 06/03/22 15:09:52 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    fix obscure error lookup

  ndb/src/kernel/vm/TransporterCallback.cpp
    1.13 06/03/22 15:09:49 jonas@perch.ndb.mysql.com +3 -1
    Fix error lookup

ChangeSet
  1.1616.2512.8 06/03/22 15:06:44 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Add per partition info (optionally to ndb_desc)

  ndb/tools/desc.cpp
    1.10.1.4 06/03/22 15:06:42 jonas@perch.ndb.mysql.com +77 -0
    Add per partition info (optionally to ndb_desc)

ChangeSet
  1.2086.9.1 06/03/22 14:57:24 msvensson@neptunus.(none) +2 -0
  Bug#18071 Result from MATCH() uses too many decimals
   - Use FORMAT as a workaround to only output the first 6 decimals of the value returned
  from MATCH
   - This has been done before

  mysql-test/t/fulltext.test
    1.81 06/03/22 14:57:20 msvensson@neptunus.(none) +1 -1
    Use FORMAT to only output the first 6 decimals from MATCH

  mysql-test/r/fulltext.result
    1.85 06/03/22 14:57:20 msvensson@neptunus.(none) +5 -5
    Use FORMAT to only output the first 6 decimals from MATCH

ChangeSet
  1.1616.2512.7 06/03/22 13:38:03 jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest 
    Update makefile for removed files

  ndb/test/run-test/Makefile.am
    1.15.1.4 06/03/22 13:38:01 jonas@perch.ndb.mysql.com +4 -5
    Update makefile for removed files

ChangeSet
  1.1616.2512.6 06/03/22 12:18:07 jonas@perch.ndb.mysql.com +1 -0
  ndb - 
    some more ndb-autotest updates (previously uncommitted...but in use)

  ndb/test/run-test/ndb-autotest.sh
    1.18 06/03/22 12:18:05 jonas@perch.ndb.mysql.com +5 -4
    More autotest updates

ChangeSet
  1.1616.2512.5 06/03/22 12:11:51 jonas@perch.ndb.mysql.com +5 -0
  ndb -
    minor update to ndb-autotest.sh and config files

  ndb/test/run-test/ndb-autotest.sh
    1.17 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add support for conf per host

  ndb/test/run-test/conf-shark.txt
    1.3 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-ndbmaster.txt
    1.5 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-dl145a.txt
    1.6 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-daily-devel-ndbmaster.txt
    1.4 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-ndbmaster.txt
    1.4 06/03/22 12:04:50 jonas@perch.ndb.mysql.com +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> ndb/test/run-test/conf-ndbmaster.txt

  ndb/test/run-test/conf-shark.txt
    1.2 06/03/22 12:03:51 jonas@perch.ndb.mysql.com +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-shark.txt -> ndb/test/run-test/conf-shark.txt

  ndb/test/run-test/conf-dl145a.txt
    1.5 06/03/22 12:03:14 jonas@perch.ndb.mysql.com +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-dl145a.txt -> ndb/test/run-test/conf-dl145a.txt

ChangeSet
  1.1616.2512.4 06/03/22 11:44:31 jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#18414
    Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding

  ndb/test/run-test/daily-basic-tests.txt
    1.13.2.8 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +4 -0
    Add testcase for bug18414

  ndb/test/ndbapi/testTimeout.cpp
    1.10.1.3 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +5 -2
    Fix error code checking

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.7 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +73 -0
    Add testcase for bug18414

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.42.1.22 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +44 -8
    Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.21 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +0 -4
    remove dumping of LCP info during NF

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.8.1.7 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +2 -0
    New error code

ChangeSet
  1.2086.5.4 06/03/22 13:11:31 bar@mysql.com +1 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b18004
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/table.cc
    1.218 06/03/22 13:11:23 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2512.3 06/03/21 15:13:41 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18118
    timeslice DUMP(7015)

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.20 06/03/21 15:13:39 jonas@perch.ndb.mysql.com +74 -52
    timeslice DUMP(7015)

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.7 06/03/21 15:13:39 jonas@perch.ndb.mysql.com +3 -0
    doc...

ChangeSet
  1.1616.2512.2 06/03/21 14:47:10 jonas@perch.ndb.mysql.com +9 -0
  ndb - bug#18385
    Partial system restart, can not try to start with higher GCI that own
    even if knowing about a higher number

  ndb/test/src/NdbRestarter.cpp
    1.9.1.2 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +33 -0
    Add new method for selecting random node

  ndb/test/run-test/daily-basic-tests.txt
    1.13.2.7 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +4 -0
    Run test in daily-basic

  ndb/test/ndbapi/testSystemRestart.cpp
    1.9 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +53 -0
    Add new testcase for bug#18385

  ndb/test/include/NdbRestarter.hpp
    1.5 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +1 -0
    Add new method for selecting random node

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.19 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +77 -22
    Fix so that we don't try to restart to a too new GCI when doing a partial start
    Add new error code when this node later tries to join

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.6.1.4 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +0 -1
    Move error codes into StartPerm + Add new error code

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.8.1.6 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +2 -0
    Add new error insert

  ndb/include/kernel/signaldata/StartPerm.hpp
    1.2 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +6 -0
    Move error codes into StartPerm + Add new error code

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.6 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +1 -0
    Add new dump for setting time between gcp

ChangeSet
  1.2086.6.1 06/03/21 14:35:49 mats@mysql.com +6 -0
  BUG#18293 (Values in stored procedures written to binlog unescaped):
  Generating character set-independent quoting of strings for the
  binary log when executing statements from inside stored procedure.

  sql/sp_head.cc
    1.205 06/03/21 14:35:45 mats@mysql.com +5 -5
    Escaping string value representing a string item.

  sql/mysql_priv.h
    1.379 06/03/21 14:35:45 mats@mysql.com +2 -0
    Adding new function.

  sql/log_event.cc
    1.204 06/03/21 14:35:44 mats@mysql.com +31 -0
    Adding characters set-independent code to separate function.

  sql/item.cc
    1.209 06/03/21 14:35:44 mats@mysql.com +1 -18
    Cutting out character set-independent string escaping code and putting it
    in a separate function. 

  mysql-test/t/ctype_cp932_binlog.test
    1.3 06/03/21 14:35:44 mats@mysql.com +23 -0
    Adding check that string literals are written correctly for multi-byte
    character sets.

  mysql-test/r/ctype_cp932_binlog.result
    1.3 06/03/21 14:35:44 mats@mysql.com +29 -0
    Result change

ChangeSet
  1.2062.3.1 06/03/21 11:21:52 msvensson@neptunus.(none) +1 -0
  Use yaSSL as default for BUILD/* scripts

  BUILD/SETUP.sh
    1.58 06/03/21 11:21:42 msvensson@neptunus.(none) +2 -2
    Use yaSSL as default for BUILD/* scripts

ChangeSet
  1.2088 06/03/21 10:14:47 jonas@perch.ndb.mysql.com +2 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  scripts/make_binary_distribution.sh
    1.108 06/03/21 10:14:44 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.31 06/03/21 10:14:44 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2086.5.1 06/03/20 21:35:05 msvensson@neptunus.(none) +5 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835

  sql/sql_udf.cc
    1.56 06/03/20 21:34:55 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item_func.cc
    1.275 06/03/20 21:34:55 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.79 06/03/20 21:34:54 msvensson@neptunus.(none) +0 -0
    Auto merged

  configure.in
    1.379 06/03/20 21:34:54 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.228 06/03/20 21:34:54 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2053.44.6 06/03/20 19:55:38 msvensson@neptunus.(none) +1 -0
  Don't look for "dlopen" if server linked with -static or -all-static flag. Update after review

  configure.in
    1.374.1.2 06/03/20 19:55:34 msvensson@neptunus.(none) +5 -3
    Don't look for "dlopen" if server linked with -static or -all-static flag

ChangeSet
  1.1616.2510.6 06/03/20 14:55:14 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#18352
    remove debug prinout

  ndb/src/ndbapi/TransporterFacade.cpp
    1.26.1.8 06/03/20 14:55:12 jonas@perch.ndb.mysql.com +0 -1
    ndb - bug#18352
      remove debug prinout

ChangeSet
  1.1616.2510.5 06/03/20 14:53:29 jonas@perch.ndb.mysql.com +3 -0
  ndb - wl2610, bug#18352
    Remove useless and tricky state fiddleing in TC
      to syncronize NF_CompleteRep as code is already present in DIH aswell
    Keep broadcast of TAKEOVER_TCCONF for online upgrade

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.42.1.21 06/03/20 14:53:27 jonas@perch.ndb.mysql.com +42 -144
    Remove useless and tricky state fiddleing in TC
      to syncronize NF_CompleteRep as code is already present in DIH aswell
      Keep broadcast of TAKEOVER_TCCONF for online upgrade

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.18.1.5 06/03/20 14:53:27 jonas@perch.ndb.mysql.com +0 -9
    Remove useless and tricky state fiddleing in TC
      to syncronize NF_CompleteRep as code is already present in DIH aswell
      Keep broadcast of TAKEOVER_TCCONF for online upgrade

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.1.22 06/03/20 14:53:27 jonas@perch.ndb.mysql.com +166 -0
    Add clever dump for showing active operations

ChangeSet
  1.1616.2510.4 06/03/20 14:49:46 jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#18352
    Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
    When getting 4012, set NeedAbort and ReleaseOnClose

  ndb/test/run-test/daily-basic-tests.txt
    1.13.2.6 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +4 -0
    Add testcase for 4012

  ndb/test/ndbapi/testTimeout.cpp
    1.10.1.2 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +101 -0
    Add testcase for 4012

  ndb/src/ndbapi/TransporterFacade.hpp
    1.18.1.2 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +1 -0
    Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT

  ndb/src/ndbapi/TransporterFacade.cpp
    1.26.1.7 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +14 -0
    Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT

  ndb/src/ndbapi/Ndbif.cpp
    1.24.2.2 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +7 -5
    Use variable timeout for waitfor, 
      when receiving 4012, set NeedAbort and ReleaseOnClose

  ndb/src/ndbapi/NdbConnection.cpp
    1.30.6.1 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +2 -2
    Use variable for WAITFOR_RESPONSE_TIMEOUT

ChangeSet
  1.1616.2511.1 06/03/20 16:28:25 bar@mysql.com +7 -0
  Bug#17374: select ... like 'A%' operator fails to find value on columuns with key
  Fixed that LIKE worked case insensitively for latin2_czech_cs,
  which was wrong for a case sensitive collation.

  mysql-test/t/ctype_latin2_ch.test
    1.1 06/03/20 16:28:20 bar@mysql.com +30 -0
    New BitKeeper file ``mysql-test/t/ctype_latin2_ch.test''

  mysql-test/r/have_latin2_ch.require
    1.1 06/03/20 16:28:20 bar@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/have_latin2_ch.require''

  mysql-test/r/ctype_latin2_ch.result
    1.1 06/03/20 16:28:20 bar@mysql.com +30 -0
    New BitKeeper file ``mysql-test/r/ctype_latin2_ch.result''

  mysql-test/t/ctype_latin2_ch.test
    1.0 06/03/20 16:28:20 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/t/ctype_latin2_ch.test

  mysql-test/r/have_latin2_ch.require
    1.0 06/03/20 16:28:20 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/r/have_latin2_ch.require

  mysql-test/r/ctype_latin2_ch.result
    1.0 06/03/20 16:28:20 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/r/ctype_latin2_ch.result

  mysql-test/include/have_latin2_ch.inc
    1.1 06/03/20 16:28:19 bar@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_latin2_ch.inc''

  strings/ctype-czech.c
    1.52.1.3 06/03/20 16:28:19 bar@mysql.com +1 -1
    Use my_wildcmp_bin instead of case insensitive my_wildcmp_8bit

  strings/ctype-bin.c
    1.54.2.1 06/03/20 16:28:19 bar@mysql.com +4 -4
    Making my_wildcmp_bin public instead of static

  mysql-test/include/have_latin2_ch.inc
    1.0 06/03/20 16:28:19 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/include/have_latin2_ch.inc

  include/m_ctype.h
    1.102.2.1 06/03/20 16:28:19 bar@mysql.com +5 -0
    Making my_wildcmp_bin public instead of static

ChangeSet
  1.1616.2144.120 06/03/20 14:43:02 bar@mysql.com +4 -0
    Bug#18004 Connecting crashes server when default charset is UCS2
  table.cc:
    Fixing to use system_charset_info instead of default_charset_info.
    Crash happened because the "ctype" array is empty in UCS2,
    and thus cannot be used with my_isspace().
    The reason why UCS2 appeared in this context was because of
    of default_charset_info variable incorrectly substituted to my_isspace().
    As functions check_db_name(), check_table_name() and check_column_name()
    always get values in utf8, system_charset_info must be used instead.
  ctype_ucs2_def.test, ctype_ucs2_def-master.opt, ctype_ucs2_def.result:
    new file

  sql/table.cc
    1.111.4.2 06/03/20 14:36:41 bar@mysql.com +3 -3
    Bug#18004 Connecting crashes server when default charset is UCS2
    Use of default_charset_info was wrong.
    Functions check_db_name, check_table_name and check_column_name
    get values of system_charset_info character set (utf8).

  mysql-test/t/ctype_ucs2_def.test
    1.1 06/03/20 14:36:28 bar@mysql.com +9 -0

  mysql-test/t/ctype_ucs2_def-master.opt
    1.1 06/03/20 14:36:28 bar@mysql.com +1 -0

  mysql-test/r/ctype_ucs2_def.result
    1.1 06/03/20 14:36:28 bar@mysql.com +6 -0

  mysql-test/t/ctype_ucs2_def.test
    1.0 06/03/20 14:36:28 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b18004/mysql-test/t/ctype_ucs2_def.test

  mysql-test/t/ctype_ucs2_def-master.opt
    1.0 06/03/20 14:36:28 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b18004/mysql-test/t/ctype_ucs2_def-master.opt

  mysql-test/r/ctype_ucs2_def.result
    1.0 06/03/20 14:36:28 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b18004/mysql-test/r/ctype_ucs2_def.result

ChangeSet
  1.1616.2510.3 06/03/20 11:29:58 jonas@perch.ndb.mysql.com +3 -0
  ndb - wl2610
    Activly abort transactions (that's affected) during NF
    This removes a lot of bugs that can occur otherwise is using
      high value for TransactionDeadLockTimout

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.42.1.20 06/03/20 11:29:56 jonas@perch.ndb.mysql.com +145 -47
    Active transaction baortion

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.18.1.4 06/03/20 11:29:56 jonas@perch.ndb.mysql.com +17 -1
    Add bitmask of participating nodes to transaction record
    Add bitmask of node fail steps, so that NF_CompleteRep is not sent until all steps has completed

  ndb/include/kernel/signaldata/TcContinueB.hpp
    1.3 06/03/20 11:29:56 jonas@perch.ndb.mysql.com +2 -1
    New continueb for active transaction abort on nf

ChangeSet
  1.2086.1.10 06/03/20 14:17:47 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#18224 VIEW on information_schema crashes the server
    additional check for subselect

  sql/sql_show.cc
    1.313 06/03/20 14:17:41 gluh@mysql.com +2 -1
    Fix for bug#18224 VIEW on information_schema crashes the server
      additional check for subselect

  mysql-test/t/information_schema.test
    1.70 06/03/20 14:17:41 gluh@mysql.com +5 -0
    Fix for bug#18224 VIEW on information_schema crashes the server
      test case

  mysql-test/r/information_schema.result
    1.99 06/03/20 14:17:41 gluh@mysql.com +7 -0
    Fix for bug#18224 VIEW on information_schema crashes the server
      test case

ChangeSet
  1.2086.1.9 06/03/20 13:42:02 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
  
  Crash happened when one selected data from one of INFORMATION_SCHEMA
  tables and in order to build its contents server had to open view which
  used stored function and table or view on which one had not global or
  database-level privileges (e.g. had only table-level or had no
  privileges at all).
  
  The crash was caused by usage of check_grant() function, which assumes
  that either number of tables to be inspected by it is limited explicitly
  or table list used and thd->lex->query_tables_own_last value correspond
  to each other (the latter should be either 0 or point to next_global
  member of one of elements of this table list), in conditions when
  above assumptions were not true. This fix just explicitly limits
  number of tables to be inspected. Other negative effects which are
  caused by the fact that thd->lex->query_tables_own_last might not
  be set properly during processing of I_S tables are less disastrous
  and will be reported and fixed separetely.
  

  sql/sql_show.cc
    1.312 06/03/20 13:41:56 gluh@mysql.com +1 -1
    Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
    
    Crash happened when one selected data from one of INFORMATION_SCHEMA
    tables and in order to build its contents server had to open view which
    used stored function and table or view on which one had not global or
    database-level privileges (e.g. had only table-level or had no
    privileges at all).
    
    The crash was caused by usage of check_grant() function, which assumes
    that either number of tables to be inspected by it is limited explicitly
    or table list used and thd->lex->query_tables_own_last value correspond
    to each other (the latter should be either 0 or point to next_global
    member of one of elements of this table list), in conditions when
    above assumptions were not true. This fix just explicitly limits
    number of tables to be inspected. Other negative effects which are
    caused by the fact that thd->lex->query_tables_own_last might not
    be set properly during processing of I_S tables are less disastrous
    and will be reported and fixed separetely.
    

  sql/sql_acl.cc
    1.190 06/03/20 13:41:56 gluh@mysql.com +7 -0
      added note

  mysql-test/t/information_schema_db.test
    1.3 06/03/20 13:41:56 gluh@mysql.com +31 -0
    Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
      test case

  mysql-test/r/information_schema_db.result
    1.6 06/03/20 13:41:56 gluh@mysql.com +14 -0
    Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
      test case

ChangeSet
  1.2086.1.8 06/03/18 10:11:36 kent@mysql.com +2 -0
  Merge

  configure.in
    1.378 06/03/18 10:11:29 kent@mysql.com +2 -3

  sql/ha_innodb.cc
    1.288 06/03/18 10:09:42 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2086.4.1 06/03/17 18:46:34 cmiller@calliope.local +1 -0
  No longer leak file descriptors in mysql_close.  Fixes Bug#15846.

  vio/viosocket.c
    1.37 06/03/17 18:46:25 cmiller@calliope.local +14 -8
    ORs were wrong to begin with, but more importantly, we mustn't use 
    shortable-circuit logic.
    
    Also newly reap the connection-closed event handle.

ChangeSet
  1.2053.37.13 06/03/17 12:10:08 kent@mysql.com +1 -0
  configure.in:
    NDB_VERSION_BUILD has to be numeric

  configure.in
    1.375.1.2 06/03/17 12:09:52 kent@mysql.com +2 -2
    NDB_VERSION_BUILD has to be numeric

