ChangeSet
  1.2463 06/01/27 13:38:15 kent@mysql.com +1 -0
  disabled.def:
    Enabled rpl_* tests now when bug fixed

  mysql-test/t/disabled.def
    1.2 06/01/27 13:37:51 kent@mysql.com +0 -3
    Enabled rpl_* tests now when bug fixed

ChangeSet
  1.2462 06/01/27 01:38:05 kent@mysql.com +1 -0
  configure.in:
    Generated "libmysql.ver" will be in \$(top_builddir)

  configure.in
    1.403 06/01/27 01:37:13 kent@mysql.com +1 -1
    Generated "libmysql.ver" will be in \$(top_builddir)

ChangeSet
  1.2460 06/01/26 16:00:49 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1

  sql/sql_select.cc
    1.449 06/01/26 16:00:46 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2458.1.2 06/01/26 12:51:34 aelkin@mysql.com +2 -0
  BUG#16487 importing the test case from 5.0 (the fix is done in BUG#15699)

  mysql-test/t/rpl_ignore_table.test
    1.1 06/01/26 12:51:31 aelkin@mysql.com +28 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_table.test''

  mysql-test/t/rpl_ignore_table-slave.opt
    1.1 06/01/26 12:51:31 aelkin@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_table-slave.opt''

  mysql-test/t/rpl_ignore_table.test
    1.0 06/01/26 12:51:31 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_ignore_table.test

  mysql-test/t/rpl_ignore_table-slave.opt
    1.0 06/01/26 12:51:31 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_ignore_table-slave.opt

ChangeSet
  1.2458.1.1 06/01/26 12:49:55 aelkin@mysql.com +5 -0
  BUG#15699 importing the fix from 5.0

  mysql-test/r/rpl_ignore_table.result
    1.1 06/01/26 12:49:52 aelkin@mysql.com +16 -0
    New BitKeeper file ``mysql-test/r/rpl_ignore_table.result''

  mysql-test/r/rpl_ignore_table.result
    1.0 06/01/26 12:49:52 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/r/rpl_ignore_table.result

  mysql-test/t/rpl_multi_update4.test
    1.1 06/01/26 12:47:59 aelkin@mysql.com +44 -0
    New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''

  mysql-test/t/rpl_multi_update4-slave.opt
    1.1 06/01/26 12:47:59 aelkin@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''

  mysql-test/r/rpl_multi_update4.result
    1.1 06/01/26 12:47:59 aelkin@mysql.com +25 -0
    New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''

  sql/sql_parse.cc
    1.475 06/01/26 12:47:59 aelkin@mysql.com +10 -5
    BUG#15699,16487 merge of the fix made in 5.0

  mysql-test/t/rpl_multi_update4.test
    1.0 06/01/26 12:47:59 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_multi_update4.test

  mysql-test/t/rpl_multi_update4-slave.opt
    1.0 06/01/26 12:47:59 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_multi_update4-slave.opt

  mysql-test/r/rpl_multi_update4.result
    1.0 06/01/26 12:47:59 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/r/rpl_multi_update4.result

ChangeSet
  1.2459 06/01/26 10:16:28 tomas@poseidon.ndb.mysql.com +1 -0
  reserved config numbers in ndb

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.17 06/01/26 10:16:20 tomas@poseidon.ndb.mysql.com +5 -0
    reserved config numbers in ndb

ChangeSet
  1.2458 06/01/26 00:09:04 sergefp@mysql.com +1 -0
  BUG#15935: post-review fixes: added comment

  sql/sql_update.cc
    1.153 06/01/26 00:09:01 sergefp@mysql.com +10 -0
    BUG#15935: post-review fixes: added comment

ChangeSet
  1.2457 06/01/26 00:06:20 sergefp@mysql.com +2 -0
  Merge

  mysql-test/t/update.test
    1.28 06/01/26 00:06:17 sergefp@mysql.com +0 -1
    Merge

  mysql-test/r/update.result
    1.30 06/01/26 00:06:17 sergefp@mysql.com +0 -0
    Merge

ChangeSet
  1.2456 06/01/25 23:28:39 evgen@moonbone.local +1 -0
  sql_base.cc:
    Small fix after merge of fix for bug#16510

  sql/sql_base.cc
    1.264 06/01/25 23:25:50 evgen@moonbone.local +0 -1
    Small fix after merge of fix for bug#16510

ChangeSet
  1.2454.1.1 06/01/25 23:25:23 sergefp@mysql.com +3 -0
  BUG#15935: In mysql_update, don't use full index scan when we could have used quick select scan.

  sql/sql_update.cc
    1.152 06/01/25 23:25:19 sergefp@mysql.com +1 -2
    BUG#15935: 
    - Do account for the fact that used_index!=MAX_KEY is also true for cases
      when quick select is used, and use quick select then (and not full index scan).
    - Also removed the redundant "used_index= MAX_KEY" statement

  mysql-test/t/update.test
    1.26.1.1 06/01/25 23:25:19 sergefp@mysql.com +12 -0
    Testcase for BUG#15935

  mysql-test/r/update.result
    1.28.1.1 06/01/25 23:25:19 sergefp@mysql.com +15 -0
    Testcase for BUG#15935

ChangeSet
  1.2455 06/01/24 22:10:39 evgen@moonbone.local +3 -0
  Manually merged

  mysql-test/t/update.test
    1.27 06/01/24 22:10:37 evgen@moonbone.local +8 -8
    Manually merged

  mysql-test/r/update.result
    1.29 06/01/24 22:10:37 evgen@moonbone.local +4 -4
    Manually merged

  sql/sql_base.cc
    1.263 06/01/24 21:50:09 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2451.3.1 06/01/24 13:54:34 joerg@mysql.com +1 -0
  Test "ctype_ucs":  Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

  mysql-test/t/ctype_ucs.test
    1.28 06/01/24 13:54:30 joerg@mysql.com +2 -0
    Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

ChangeSet
  1.1346.1.826 06/01/23 21:51:32 evgen@moonbone.local +3 -0
  Fixed bug #16510: Updating field named like '*name' caused server crash.
  
  When setup_fields() function finds field named '*' it expands it to the list
  of all table fields. It does so by checking that the first char of
  field_name is '*', but it doesn't checks that the '* is the only char.
  Due to this, when updating table with a field named like '*name', such field
  is wrongly treated as '*' and expanded. This leads to making list of fields
  to update being longer than list of the new values. Later, the fill_record() 
  function crashes by dereferencing null when there is left fields to update,
  but no more values.
  
  Added check in the setup_fields() function which ensures that the field
  expanding will be done only when '*' is the only char in the field name.

  sql/sql_base.cc
    1.117.1.77 06/01/23 21:50:25 evgen@moonbone.local +1 -0
    Fixed bug #16510: Updating field named like '*name' caused server crash.
    Added check in the setup_fields() function which ensures that the field
    expanding will be done only when '*' is the only char in the field name.

  mysql-test/r/update.result
    1.8.1.10 06/01/23 21:47:18 evgen@moonbone.local +4 -0
    Added test case for bug#16510: Updating field named like '*name' caused server crash

  mysql-test/t/update.test
    1.6.1.10 06/01/23 21:46:48 evgen@moonbone.local +8 -0
    Added test case for bug#16510: Updating field named like '*name' caused server crash

ChangeSet
  1.2451.2.1 06/01/23 17:15:33 svoj@april.(none) +3 -0
  BUG#16489 - utf8 + fulltext leads to corrupt index file.
  Fixed that UPDATE statement crashes multi-byte charset fulltext index.

  mysql-test/t/fulltext2.test
    1.13 06/01/23 17:15:31 svoj@april.(none) +8 -0
    Added a testcase for BUG#16489.

  mysql-test/r/fulltext2.result
    1.11 06/01/23 17:15:31 svoj@april.(none) +5 -0
    Added a testcase for BUG#16489.

  myisam/ft_update.c
    1.36 06/01/23 17:15:31 svoj@april.(none) +4 -0
    Fixed that UPDATE statement crashes multi-byte charset fulltext index.
    While updating, always rewrite multi-byte charset fulltext index.

ChangeSet
  1.2449 06/01/21 17:53:29 hf@eagle.intranet.mysql.r18.ru +1 -0
  Merge hf@192.168.21.12:work/mysql-4.1.9855
  into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg

  sql/item_func.cc
    1.257 06/01/21 17:53:24 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.2447.90.3 06/01/20 00:08:26 stewart@mysql.com +1 -0
  reintroduce --no-defaults to ndb_mgmd

  mysql-test/ndb/ndbcluster.sh
    1.41 06/01/20 00:08:22 stewart@mysql.com +1 -1
    have made a real fix for mgmd not starting with --no-defaults. re-introduce it to the test suite

ChangeSet
  1.2447.91.1 06/01/19 22:50:54 stewart@mysql.com +2 -0
  small typo fixes

  ndb/tools/ndb_size.pl
    1.6 06/01/19 22:50:51 stewart@mysql.com +1 -1
    small typo

  mysql-test/ndb/ndbcluster.sh
    1.40 06/01/19 22:50:51 stewart@mysql.com +1 -1
    small fix to make ndb_mgmd run

ChangeSet
  1.2447.90.1 06/01/18 22:50:31 konstantin@mysql.com +2 -0
  A fix and a test case for Bug#15613 "libmysqlclient API function
   mysql_stmt_prepare returns wrong field length"

  tests/mysql_client_test.c
    1.163 06/01/18 22:50:26 konstantin@mysql.com +65 -0
    A test case for Bug#15613

  sql/protocol.cc
    1.105 06/01/18 22:50:26 konstantin@mysql.com +16 -2
    A fix for Bug#15613: make sure that result set column length
    is evaluated correctly for BLOB/TEXT columns.

ChangeSet
  1.2447.89.1 06/01/18 14:12:27 msvensson@neptunus.(none) +1 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634

  sql/sql_select.cc
    1.447.1.1 06/01/18 14:12:21 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2447.66.16 06/01/18 13:49:37 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1

  sql/sql_select.cc
    1.448 06/01/18 13:49:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.204 06/01/18 13:49:33 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2447.88.1 06/01/18 13:48:57 bell@sanja.is.com.ua +5 -0
  Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).

  sql/sql_select.h
    1.79 06/01/18 13:48:54 bell@sanja.is.com.ua +9 -2
    JOINs constructor added, initialization of them fixed (it is not related to the bug directly but might cause other problems).

  sql/sql_select.cc
    1.443.1.1 06/01/18 13:48:54 bell@sanja.is.com.ua +14 -0
    Allocation of tmp_join fixed to involve constructor (it is not related to the bug directly but might cause other problems).
    Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).

  sql/sql_class.cc
    1.202.1.1 06/01/18 13:48:54 bell@sanja.is.com.ua +3 -0
    Debug prints are added.

  mysql-test/t/kill.test
    1.11 06/01/18 13:48:54 bell@sanja.is.com.ua +48 -1
    BUG#14851 test

  mysql-test/r/kill.result
    1.6 06/01/18 13:48:54 bell@sanja.is.com.ua +13 -1
    BUG#14851 test

ChangeSet
  1.2447.87.1 06/01/18 12:28:52 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634

  sql/sql_select.cc
    1.446.1.1 06/01/18 12:28:46 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2447.86.2 06/01/17 23:19:43 konstantin@mysql.com +2 -0
  A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":
  use the right type in mysql_stmt_attr_get

  tests/mysql_client_test.c
    1.162 06/01/17 23:19:39 konstantin@mysql.com +20 -0
    A test case for Bug#16144

  libmysql/libmysql.c
    1.299 06/01/17 23:19:38 konstantin@mysql.com +1 -1
    Fix Bug#16144 "mysql_stmt_attr_get type error"

ChangeSet
  1.2447.86.1 06/01/18 00:02:25 svoj@april.(none) +1 -0
  Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1

  configure.in
    1.402 06/01/18 00:02:21 svoj@april.(none) +0 -0
    Auto merged

ChangeSet
  1.2447.66.13 06/01/17 19:40:40 msvensson@devsrv-b.mysql.com +1 -0
  Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-bug14634
  into  devsrv-b.mysql.com:/space/magnus/my41-bug14634

  sql/sql_select.cc
    1.447 06/01/17 19:40:33 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.85.1 06/01/17 16:48:26 msvensson@neptunus.(none) +1 -0
  Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error

  sql/sql_select.cc
    1.444.2.1 06/01/17 16:48:23 msvensson@neptunus.(none) +5 -7
    Backport from 5.0, catch the new errno that is returned

ChangeSet
  1.2447.84.1 06/01/17 18:51:08 svoj@april.(none) +4 -0
  BUG#3074: Unversioned symbols in shared library
  libmysqlclient versioning when linked with GNU ld.

  libmysql/libmysql.ver.in
    1.1 06/01/17 18:51:05 svoj@april.(none) +1 -0
    New BitKeeper file ``libmysql/libmysql.ver.in''

  libmysql/libmysql.ver.in
    1.0 06/01/17 18:51:05 svoj@april.(none) +0 -0
    BitKeeper file /home/svoj/devel/mysql/BUG3074/mysql-4.1/libmysql/libmysql.ver.in

  libmysql/Makefile.shared
    1.58 06/01/17 18:51:05 svoj@april.(none) +1 -1
    libmysqlclient versioning when linked with GNU ld.

  configure.in
    1.400.1.1 06/01/17 18:51:05 svoj@april.(none) +10 -1
    libmysqlclient versioning when linked with GNU ld.

  BitKeeper/etc/ignore
    1.234 06/01/17 18:51:05 svoj@april.(none) +1 -0
    Added libmysql/libmysql.ver to the ignore list

ChangeSet
  1.2447.66.12 06/01/17 12:55:30 joerg@mysql.com +1 -0
  Increase the version number to 4.1.18

  configure.in
    1.401 06/01/17 12:55:26 joerg@mysql.com +2 -2
    Increase the version number to 4.1.18

ChangeSet
  1.2447.66.11 06/01/17 09:05:18 joerg@mysql.com +0 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

ChangeSet
  1.2447.83.1 06/01/17 01:03:03 konstantin@mysql.com +4 -0
  A fix for Bug#13337 "ps test fails if configure wo/ usc2"

  mysql-test/t/ps.test
    1.46 06/01/17 01:02:57 konstantin@mysql.com +0 -13
    Fix Bug#13337 (move the test that uses UCS character set to 
    ctype_ucs)

  mysql-test/t/ctype_ucs.test
    1.27 06/01/17 01:02:57 konstantin@mysql.com +14 -0
    Fix Bug#13337 (move the test that uses UCS character set to 
    ctype_ucs)

  mysql-test/r/ps.result
    1.45 06/01/17 01:02:57 konstantin@mysql.com +0 -19
    Test results changed (Bug#13337)

  mysql-test/r/ctype_ucs.result
    1.28 06/01/17 01:02:57 konstantin@mysql.com +19 -0
    Test results changed (Bug#13337)

ChangeSet
  1.2447.81.4 06/01/16 16:21:41 andrey@lmy004. +3 -0
  Merge

  sql/sql_table.cc
    1.304 06/01/16 16:21:39 andrey@lmy004. +0 -0
    SCCS merged

  mysql-test/t/create.test
    1.60 06/01/16 16:18:09 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/r/create.result
    1.87 06/01/16 16:18:09 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2447.71.14 06/01/16 15:46:37 gvb@phoenix.(none) +3 -0
  date_formats.test:
    fix for bug #15828 after review
    doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values

  sql/item_timefunc.cc
    1.97 06/01/16 15:44:53 gvb@phoenix.(none) +1 -1

  mysql-test/r/date_formats.result
    1.18 06/01/16 15:44:52 gvb@phoenix.(none) +3 -0

  mysql-test/t/date_formats.test
    1.15 06/01/16 15:39:11 gvb@phoenix.(none) +1 -1
    fix for bug #15828 after review
    doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values

ChangeSet
  1.2447.73.2 06/01/16 12:46:07 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
  into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554

  sql/ha_berkeley.cc
    1.153 06/01/16 12:46:05 msvensson@neptunus.(none) +0 -2
    Merge 4.0 -> 4.1, change is already in 4.1

ChangeSet
  1.1346.865.1 06/01/16 12:17:30 msvensson@neptunus.(none) +1 -0
  BUG#6554 Problem Building MySql on Fedora Core 3
     - Remove the local static var

  sql/ha_berkeley.cc
    1.105.3.1 06/01/16 12:13:33 msvensson@neptunus.(none) +2 -1
    Remove local static var, make it local in file instead.

ChangeSet
  1.2447.82.1 06/01/15 14:50:47 aivanov@mysql.com +5 -0
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."
   Also fixed bug 15991.

  sql/ha_innodb.cc
    1.213 06/01/15 14:50:04 aivanov@mysql.com +118 -13
    Changes from innodb-4.1-ss14 snapshot
     Fixed BUG#14056: Column prefix index on UTF-8 primary key
     causes "Can't find record.."

  mysql-test/t/innodb.test
    1.78 06/01/15 14:50:04 aivanov@mysql.com +36 -0
    Changes from innodb-4.1-ss14 snapshot
     Fixed BUG#14056: Column prefix index on UTF-8 primary key
     causes "Can't find record.."

  mysql-test/r/innodb.result
    1.107 06/01/15 14:50:04 aivanov@mysql.com +40 -0
    Changes from innodb-4.1-ss14 snapshot
     Fixed BUG#14056: Column prefix index on UTF-8 primary key
     causes "Can't find record.."

  innobase/os/os0file.c
    1.104 06/01/15 14:50:04 aivanov@mysql.com +6 -2
    Changes from innodb-4.1-ss14 snapshot
     os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
     to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
     This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
     link to a different file system. (Bug 15991)

  innobase/include/os0file.h
    1.37 06/01/15 14:50:03 aivanov@mysql.com +3 -2
    Changes from innodb-4.1-ss14 snapshot
     os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
     to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
     This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
     link to a different file system. (Bug 15991)

ChangeSet
  1.2447.71.13 06/01/14 16:06:51 gvb@phoenix.(none) +1 -0
  item_timefunc.cc:
    fix for bug #15828 after review

  sql/item_timefunc.cc
    1.96 06/01/14 16:06:22 gvb@phoenix.(none) +0 -1
    fix for bug #15828 after review

ChangeSet
  1.2447.71.12 06/01/14 09:53:12 gvb@phoenix.(none) +1 -0
  item_timefunc.cc:
    fix for bug#15828 after review

  sql/item_timefunc.cc
    1.95 06/01/14 09:51:39 gvb@phoenix.(none) +2 -1
    fix for bug#15828 after review

ChangeSet
  1.2447.81.1 06/01/14 04:55:07 konstantin@mysql.com +4 -0
  A fix and a test case for Bug#12734 " prepared statement may 
  return incorrect result set for a select SQL request"

  sql/item_cmpfunc.h
    1.113 06/01/14 04:55:01 konstantin@mysql.com +1 -0
    Add Item_func_like::cleanup()

  sql/item_cmpfunc.cc
    1.205 06/01/14 04:55:01 konstantin@mysql.com +6 -0
    Reset canDoTurboBM in Item_func_like::cleanup()

  mysql-test/t/ps.test
    1.45 06/01/14 04:55:00 konstantin@mysql.com +30 -0
    A test case for Bug#12734

  mysql-test/r/ps.result
    1.44 06/01/14 04:55:00 konstantin@mysql.com +34 -0
    Test results fixed (Bug#12734)

ChangeSet
  1.2447.66.10 06/01/13 17:45:01 joerg@mysql.com +2 -0
  Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1

  scripts/mysqld_multi.sh
    1.23 06/01/13 17:44:58 joerg@mysql.com +0 -0
    Auto merged

  extra/comp_err.c
    1.12 06/01/13 17:44:58 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.824 06/01/13 16:25:20 joerg@mysql.com +2 -0
  extra/comp_err.c  +  scripts/mysqld_multi.sh  :
  Copyright string fixes (bug#16106)

  scripts/mysqld_multi.sh
    1.12.1.2 06/01/13 16:24:25 joerg@mysql.com +0 -3
    The "mysql_copyright" tool will not change non-C files, so do not mention the license.
    (bug#16106)

  extra/comp_err.c
    1.6.1.3 06/01/13 16:24:25 joerg@mysql.com +3 -1
    Ensure that the license spelling is as expected by the "mysql_copyright" tool.
    (bug#16106)

ChangeSet
  1.2447.71.11 06/01/13 14:42:46 gvb@phoenix.(none) +3 -0
  fix for bug#15828
  problem was not checking 2nd parameter of str_to_date against NULL

  sql/item_timefunc.cc
    1.94 06/01/13 14:40:51 gvb@phoenix.(none) +1 -1

  mysql-test/r/date_formats.result
    1.17 06/01/13 14:40:46 gvb@phoenix.(none) +6 -0
    bk commit

  mysql-test/t/date_formats.test
    1.14 06/01/13 14:39:39 gvb@phoenix.(none) +7 -0
    fix for bug#15828
    problem was not checking 2nd parameter of str_to_date against NULL

ChangeSet
  1.2447.71.9 06/01/13 09:29:24 jonas@perch.ndb.mysql.com +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.59 06/01/13 09:29:21 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.78.1 06/01/13 11:43:50 stewart@mysql.com +7 -0
  BUG#11331 "Warning: could not add log destination" message does not provide enough info
  
  Implement error reporting to Logger and associated classes.

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.73 06/01/13 11:43:47 stewart@mysql.com +12 -2
    Report error when adding log handler

  ndb/src/common/logger/SysLogHandler.cpp
    1.5 06/01/13 11:43:47 stewart@mysql.com +1 -0
    Report an error on invalid syslog facility

  ndb/src/common/logger/Logger.cpp
    1.11 06/01/13 11:43:47 stewart@mysql.com +10 -1
    Report back errors when adding a handler via BaseString

  ndb/src/common/logger/LogHandler.cpp
    1.11 06/01/13 11:43:47 stewart@mysql.com +26 -3
    Implement error reporting.
    
    Trim spaces and tabs out of parameter names. This allows "p=v, param=value"

  ndb/src/common/logger/FileLogHandler.cpp
    1.10 06/01/13 11:43:47 stewart@mysql.com +13 -4
    Implement error reporting

  ndb/include/logger/Logger.hpp
    1.7 06/01/13 11:43:47 stewart@mysql.com +4 -1
    Add reporting back of error to addHandler(BaseString).

  ndb/include/logger/LogHandler.hpp
    1.7 06/01/13 11:43:47 stewart@mysql.com +13 -0
    Add error string to LogHandler along with error code

ChangeSet
  1.2447.71.8 06/01/12 17:47:58 jani@ua141d10.elisa.omakaista.fi +4 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

  sql/mysqld.cc
    1.609 06/01/12 17:47:55 jani@ua141d10.elisa.omakaista.fi +6 -5
    Merge from 4.0 to 4.1

  netware/mysqld_safe.c
    1.9 06/01/12 17:47:54 jani@ua141d10.elisa.omakaista.fi +17 -15
    Merge from 4.0 to 4.1

  innobase/os/os0thread.c
    1.28 06/01/12 17:27:19 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/config-netware.h
    1.11 06/01/12 17:27:19 jani@ua141d10.elisa.omakaista.fi +1 -1
    Auto merged

ChangeSet
  1.1346.1.823 06/01/12 15:10:12 jani@ua141d10.elisa.omakaista.fi +4 -0
  NetWare specific change to increase thread stack size.
  Changes to Netware specific mysqld_safe.c

  sql/mysqld.cc
    1.297.51.8 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +5 -0
    NetWare specific change to increase thread stack size.

  netware/mysqld_safe.c
    1.6.1.2 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +15 -27
    NetWare specific change to make multiple mysqld_safe instances
    work when called through a NCF file.

  innobase/os/os0thread.c
    1.24.1.1 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +9 -0
    NetWare specific change to increase thread stack size.

  include/config-netware.h
    1.4.1.4 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +3 -0
    NetWare specific change to increase thread stack size.

ChangeSet
  1.2447.77.1 06/01/11 17:31:52 konstantin@mysql.com +4 -0
  A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
  rename sha1_* to mysql_sha1_*

  sql/password.c
    1.35 06/01/11 17:31:45 konstantin@mysql.com +23 -23
    rename sha1_* to mysql_sha1_*

  sql/item_strfunc.cc
    1.239 06/01/11 17:31:45 konstantin@mysql.com +5 -3
    rename sha1_* to mysql_sha1_*

  mysys/sha1.c
    1.6 06/01/11 17:31:45 konstantin@mysql.com +8 -8
    rename sha1_* to mysql_sha1_*

  include/sha1.h
    1.4 06/01/11 17:31:45 konstantin@mysql.com +3 -3
    rename sha1_* to mysql_sha1_*

ChangeSet
  1.2447.71.6 06/01/10 19:13:12 monty@mysql.com +2 -0
  Re-run fix-fields on condition if table was reopened in HANDLERREAD

  sql/sql_handler.cc
    1.66 06/01/10 19:13:08 monty@mysql.com +8 -3
    Re-run fix-fields on condition if table was reopened

  sql/sql_base.cc
    1.262 06/01/10 19:13:08 monty@mysql.com +16 -4
    Added more comments

ChangeSet
  1.2447.71.5 06/01/10 18:03:54 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/home/my/mysql-4.1

  sql/sql_select.cc
    1.446 06/01/10 18:03:51 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.71.4 06/01/10 17:57:46 aivanov@mysql.com +2 -0
  Commenting out testcases which cause type_time.test failure.
   To be uncommented after fixing bug 15805.

  mysql-test/t/type_time.test
    1.8 06/01/10 17:55:54 aivanov@mysql.com +10 -6
    Temporaly commented out testcases which cause type_time.test failure.
     To be uncommented after fixing bug 15805.

  mysql-test/r/type_time.result
    1.14 06/01/10 17:55:54 aivanov@mysql.com +0 -24
    Fixing testcases results.

ChangeSet
  1.2447.74.1 06/01/09 10:57:28 msvensson@devsrv-b.mysql.com +1 -0
  Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598
  into  devsrv-b.mysql.com:/space/magnus/my41-bug15598

  sql/sql_acl.cc
    1.173 06/01/09 10:57:23 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.73.1 06/01/09 10:31:07 msvensson@neptunus.(none) +3 -0
  Bug #15598 Server crashes in specific case during setting new password
   - When acl_user->host.hostname is NULL compare it as ""

  sql/sql_acl.cc
    1.170.1.1 06/01/09 10:31:01 msvensson@neptunus.(none) +3 -2
    If acl_user->host.hostname is NULL compare it as "" 

  mysql-test/t/grant.test
    1.33 06/01/09 10:31:01 msvensson@neptunus.(none) +12 -0
    Test user with host ''

  mysql-test/r/grant.result
    1.40 06/01/09 10:31:01 msvensson@neptunus.(none) +9 -0
    Test user with host ''

ChangeSet
  1.2447.72.2 06/01/09 11:10:49 monty@mysql.com +1 -0
  After merge fix (Lines lost in manual merge)

  sql/sql_handler.cc
    1.65 06/01/09 11:10:45 monty@mysql.com +3 -0
    After merge fix (Lines lost in manual merge)

ChangeSet
  1.2447.72.1 06/01/08 19:07:49 monty@mysql.com +5 -0
  Merge mysql.com:/home/my/mysql-4.0
  into  mysql.com:/home/my/mysql-4.1

  sql/sql_handler.cc
    1.64 06/01/08 19:07:47 monty@mysql.com +0 -8
    manual merge

  sql/item_cmpfunc.cc
    1.204 06/01/08 19:07:47 monty@mysql.com +0 -1
    merge (keep old code)

  sql/sql_select.cc
    1.444.1.1 06/01/08 19:01:20 monty@mysql.com +0 -0
    Auto merged

  myisam/myisam_ftdump.c
    1.37 06/01/08 19:01:20 monty@mysql.com +0 -1
    Auto merged

  client/mysqlimport.c
    1.54 06/01/08 19:01:20 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.71.2 06/01/07 23:00:06 igor@rurik.mysql.com +3 -0
  Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set.

  sql/sql_select.cc
    1.445 06/01/07 22:59:56 igor@rurik.mysql.com +1 -1
    Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set.
    It happened because processing of the set functions in having started with a call of the split_sum_func
    method, instead of the split_sum_func2 method. 

  mysql-test/t/having.test
    1.13 06/01/07 22:59:56 igor@rurik.mysql.com +12 -0
    Added a test case for bug #14274.

  mysql-test/r/having.result
    1.14 06/01/07 22:59:56 igor@rurik.mysql.com +13 -0
    Added a test case for bug #14274.

ChangeSet
  1.1346.1.822 06/01/06 21:42:17 monty@mysql.com +5 -0
  Fixes during review of new pushed code:
  Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Safety fix for bug #13855 "select distinct with group by caused server crash"

  sql/sql_select.cc
    1.152.1.143 06/01/06 21:42:13 monty@mysql.com +8 -1
    Safety fix for bug #13855 "select distinct with group by caused server crash"
    The previous patch only removed the symptomps, this fix removed the cause of the problem
    (Which was that not all hidden_fields was stored in the temporary table)

  sql/sql_handler.cc
    1.19.1.29 06/01/06 21:42:13 monty@mysql.com +12 -34
    Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash.
    It's better to let mysql_lock_tables reopen the TABLE object in case of OPTIMIZE TABLE and fix items AFTER mysql_lock_table() instead of before

  sql/item_cmpfunc.cc
    1.20.1.45 06/01/06 21:42:13 monty@mysql.com +1 -1
    Removed compiler warning

  myisam/myisam_ftdump.c
    1.12.1.13 06/01/06 21:42:13 monty@mysql.com +1 -1
    Fixed compiler warning

  client/mysqlimport.c
    1.29.1.10 06/01/06 21:42:13 monty@mysql.com +0 -1
    Remove not used variable

ChangeSet
  1.2447.71.1 06/01/04 17:35:30 konstantin@mysql.com +7 -0
  A fix for Bug#7209 "Client error with "Access Denied" on updates 
  when high concurrency": remove HASH::current_record and make it
  an external search parameter, so that it can not be the cause of a 
  race condition under high concurrent load.
  The bug was in a race condition in table_hash_search,
  when column_priv_hash.current_record was overwritten simultaneously
  by multiple threads, causing the search for a suitable grant record
  to fail.
  No test case as the bug is repeatable only under concurrent load.

  sql/sql_cache.cc
    1.96 06/01/04 17:35:18 konstantin@mysql.com +6 -4
    - adjust to a changed declaration of hash_replace

  sql/sql_base.cc
    1.261 06/01/04 17:35:17 konstantin@mysql.com +15 -7
    - adjust to changed declarations of hash_search, hash_nex

  sql/sql_acl.cc
    1.172 06/01/04 17:35:17 konstantin@mysql.com +5 -4
    - adjust to changed declarations of hash_search, hash_next

  sql/lock.cc
    1.64 06/01/04 17:35:17 konstantin@mysql.com +3 -2
    - adjust to changed declarations of hash_search, hash_next

  mysys/testhash.c
    1.8 06/01/04 17:35:17 konstantin@mysql.com +5 -4
    - adjust the test case to changed function declarations

  mysys/hash.c
    1.44 06/01/04 17:35:16 konstantin@mysql.com +35 -25
    - remove HASH::current_record
    - change declarations of functions that use HASH in read-only mode
      to accept const HASH * instead of HASH *. 
    - implement hash_search; move the old implementation of hash_search
    to hash_first

  include/hash.h
    1.17 06/01/04 17:35:16 konstantin@mysql.com +10 -4
    - remove current_record from HASH, instead modify hash_first,
    hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter

ChangeSet
  1.2447.68.2 06/01/04 11:38:58 jonas@perch.ndb.mysql.com +1 -0
  ndb - Make testDatabuffer clean up tables

  ndb/test/ndbapi/testDataBuffers.cpp
    1.13 06/01/04 11:38:56 jonas@perch.ndb.mysql.com +20 -7
    Make testDatabuffer clean up tables

ChangeSet
  1.2447.66.7 05/12/31 10:54:36 pekka@mysql.com +1 -0
  ndb - wl#2972 (4.1) copy detached trigger fix from 5.0

  ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
    1.4 05/12/31 10:52:38 pekka@mysql.com +2 -0
    detached trigger fix from 5.0

ChangeSet
  1.2447.70.1 05/12/28 09:23:27 msvensson@neptunus.(none) +3 -0
  BUG#15775 "drop user" command does not refresh acl_check_hosts
     - DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
       connect's via TCP to fail randomly.
     - 4.1 version

  sql/sql_acl.cc
    1.171 05/12/28 09:23:21 msvensson@neptunus.(none) +12 -4
    Reload acl_check_hosts as its memory is mapped to acl_user
    Use acl_user->host.hostname when searching the acl_check_hosts list

  mysql-test/t/grant2.test
    1.15 05/12/28 09:23:21 msvensson@neptunus.(none) +33 -0
    Add test for to check that connect via TCP work after "drop user"

  mysql-test/r/grant2.result
    1.14 05/12/28 09:23:21 msvensson@neptunus.(none) +12 -0
    Update test results

ChangeSet
  1.2447.69.1 05/12/27 20:16:59 evgen@moonbone.local +3 -0
  Fix bug#14583 
  
  When InnoDB compares varchar field in ucs2 with given key using bin collation,
  it calls my_strnncollsp_ucs2_bin() to perform comparison.
  Because field length was lesser than length of key field should be padded
  with trailing spaces in order to get correct result. 
  Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
  doesn't pads field, wrong comparison result was returned. This results in
  wrong result set.
  
  my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
  but using binary collation.

  strings/ctype-ucs2.c
    1.46 05/12/27 20:15:43 evgen@moonbone.local +39 -2
    Fix bug#14583 Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
    correct records.my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
    but using binary collation.

  mysql-test/r/ctype_ucs.result
    1.27 05/12/27 20:15:25 evgen@moonbone.local +7 -0
    Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping correct records.

  mysql-test/t/ctype_ucs.test
    1.26 05/12/27 20:14:51 evgen@moonbone.local +8 -0
    Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
    correct records.

ChangeSet
  1.2447.66.4 05/12/27 10:36:19 ingo@mysql.com +2 -0
  Merge mysql.com:/home/mydev/mysql-4.1
  into  mysql.com:/home/mydev/mysql-4.1-bug5390

  sql/sql_update.cc
    1.151 05/12/27 10:36:11 ingo@mysql.com +0 -0
    Auto merged

  libmysqld/ha_blackhole.cc
    1.3 05/12/27 10:36:11 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.66.3 05/12/23 12:38:22 serg@serg.mylan +1 -0
  correct help text

  sql/mysqld.cc
    1.608 05/12/23 12:38:14 serg@serg.mylan +1 -1
    correct help text

ChangeSet
  1.2447.68.1 05/12/21 16:31:58 jonas@perch.ndb.mysql.com +2 -0
  bug#15908 - ndb 
    When scan is completed, but lqhkeyreq is outstanding on primary replica and
    starting node dies, scan will not be closed leading to error handling of failed
    node not completing

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.56.1.3 05/12/21 16:31:56 jonas@perch.ndb.mysql.com +9 -0
    Set scan state to WAIT_LQHKEY_COPY when scan is finished but LQHKEYREQ is outstanding

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.13 05/12/21 16:31:56 jonas@perch.ndb.mysql.com +3 -1
    New error code

ChangeSet
  1.2447.67.1 05/12/20 12:47:44 paul@snake-hub.snake.net +1 -0
  mysql.cc:
    Typo in help message.

  client/mysql.cc
    1.217 05/12/20 12:47:23 paul@snake-hub.snake.net +1 -1
    Typo in help message.

ChangeSet
  1.2447.66.1 05/12/21 00:18:58 stewart@mysql.com +1 -0
  build fix

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.30 05/12/21 00:18:55 stewart@mysql.com +1 -1
    build fix

ChangeSet
  1.2447.65.1 05/12/19 15:52:10 bar@mysql.com +3 -0
    Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
  field.cc:
    BLOB variations have number-in-bytes limit,
    unlike CHAR/VARCHAR which have number-of-characters limits.
    A tinyblob column can store up to 255 bytes.
    In the case of basic Latin letters (which use 1 byte per character)
    we can store up to 255 characters in a tinyblob column.
    When passing an utf8 tinyblob column as an argument into
    a function (e.g. COALESCE) we need to reserve 3*255 bytes.
    I.e. multiply length in bytes to mbcharlen for the character set.
    Although in reality a tinyblob column can never be 3*255 bytes long,
    we need to set max_length to multiply to make fix_length_and_dec()
    of the function-caller (e.g. COALESCE) calculate the correct max_length
    for the column being created.
  
  ctype_utf8.result, ctype_utf8.test:
    Adding test case.

  sql/field.cc
    1.228 05/12/19 15:28:38 bar@mysql.com +3 -3
    Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
    BLOB variations have byte limits,
    unlike CHAR/VARCHAR which have number-of-character limits.
    It means tinyblob can store up to 255 bytes.
    All of them can be basic latin letters which use 1 byte
    per character.
    I.e. we can store up to 255 characters in a tinyblob column.
    When passing a tinyblob column as an argument into
    a function (for example COALESCE or CONCAT) we
    need to reserve 3*255 bytes in the case of utf-8.
    I.e. multiply length in bytes to mbcharlen for the
    character set.

  mysql-test/r/ctype_utf8.result
    1.68 05/12/19 15:28:05 bar@mysql.com +8 -0
    Adding test case.

  mysql-test/t/ctype_utf8.test
    1.70 05/12/19 15:27:57 bar@mysql.com +10 -0
    Adding test case.

ChangeSet
  1.2447.1.17 05/12/19 14:21:42 holyfoot@deer.(none) +1 -0
  bug #15429 (Test 'func_math' not prepared for 'classic' build)

  mysql-test/t/func_math.test
    1.19 05/12/19 14:20:47 holyfoot@mysql.com +2 -0
    warnings disabled on CREATE TABLE INNODB

ChangeSet
  1.2447.1.16 05/12/19 19:06:12 stewart@mysql.com +2 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
  into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.58 05/12/19 19:06:09 stewart@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.29 05/12/19 19:06:09 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.64.1 05/12/19 19:00:17 stewart@mysql.com +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
  into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.23 05/12/19 19:00:11 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.1.14 05/12/18 14:55:05 kent@mysql.com +1 -0
  Merge

  BUILD/Makefile.am
    1.7 05/12/18 14:55:00 kent@mysql.com +12 -1

ChangeSet
  1.1346.1.820 05/12/18 14:51:19 kent@mysql.com +1 -0
  Makefile.am:
    Adjusted listing of files to put into source TAR

  BUILD/Makefile.am
    1.4.1.2 05/12/18 14:49:51 kent@mysql.com +0 -1

  BUILD/Makefile.am
    1.4.1.1 05/12/18 14:45:14 kent@mysql.com +5 -1
    Adjusted listing of files to put into source TAR

ChangeSet
  1.2447.63.1 05/12/18 13:30:01 serg@serg.mylan +3 -0
  BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
  
  for uca collation isalnum and strnncollsp don't agree on whether
  0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
  
  they still don't, the bug was fixed by avoiding strnncollsp

  mysql-test/t/fulltext2.test
    1.12 05/12/18 13:29:47 serg@serg.mylan +30 -0
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

  mysql-test/r/fulltext2.result
    1.10 05/12/18 13:29:47 serg@serg.mylan +21 -0
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

  myisam/mi_delete.c
    1.33 05/12/18 13:29:47 serg@serg.mylan +1 -1
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

ChangeSet
  1.2447.62.3 05/12/15 18:48:08 aivanov@mysql.com +3 -0
  Fixed BUG #12440: "Incorrect processing of time values containing
   long fraction and/or large exponent part".

  sql-common/my_time.c
    1.15 05/12/15 18:48:01 aivanov@mysql.com +22 -6
    Fixed bug #12440: "Incorrect processing of time values containing
     long fraction and/or large exponent part".
     Modified str_to_time(). Process properly fraction part containing
     more than 6 digits. Check for existence of exponent part which
     may result from %g formatting applied to time value specified as
     large real number.

  mysql-test/t/type_time.test
    1.7 05/12/15 18:48:01 aivanov@mysql.com +14 -0
    Added testcases for bug #12440

  mysql-test/r/type_time.result
    1.13 05/12/15 18:48:01 aivanov@mysql.com +24 -0
    Fixed testcases results (bug #12440)

ChangeSet
  1.2447.62.2 05/12/15 02:11:21 rparranovo@mysql.com +1 -0
  Makefile.am:
    - libtool wants spaces on parameters for its command line options

  zlib/Makefile.am
    1.5 05/12/15 02:11:07 rparranovo@mysql.com +1 -1
    - libtool wants spaces on parameters for its command line options

ChangeSet
  1.2447.62.1 05/12/15 00:54:15 rparranovo@mysql.com +1 -0
  Makefile.am:
    - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

  zlib/Makefile.am
    1.4 05/12/15 00:52:42 rparranovo@mysql.com +2 -0
    - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

ChangeSet
  1.2447.61.1 05/12/14 14:45:13 mskold@mysql.com +2 -0
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more predictable

  mysql-test/t/ndb_multi.test
    1.6 05/12/14 14:44:43 mskold@mysql.com +1 -0
    Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable

  mysql-test/r/ndb_multi.result
    1.4 05/12/14 14:44:43 mskold@mysql.com +1 -0
    Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable

ChangeSet
  1.2447.18.42 05/12/13 18:30:10 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Minor Netware specific changes.

  sql/tztime.cc
    1.21 05/12/13 18:30:06 jani@a193-229-222-105.elisa-laajakaista.fi +5 -0
    Code not ported to Netware yet.

  scripts/make_binary_distribution.sh
    1.90 05/12/13 18:30:06 jani@a193-229-222-105.elisa-laajakaista.fi +4 -0
    Netware specific changes. Discard platform
    specific files and added a couple of missing files.

  netware/BUILD/compile-linux-tools
    1.8 05/12/13 18:30:06 jani@a193-229-222-105.elisa-laajakaista.fi +3 -2
    Fixed compilation problem with Linux tools.

ChangeSet
  1.2447.18.41 05/12/13 18:22:00 jani@a193-229-222-105.elisa-laajakaista.fi +13 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  netware/perror.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlimport.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqldump.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqld_safe.def
    1.4 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlcheck.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlbinlog.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqladmin.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysql_install_db.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysql.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/myisampack.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/myisamlog.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/my_print_defaults.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/libmysql.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.819 05/12/13 17:53:26 jani@a193-229-222-105.elisa-laajakaista.fi +13 -0
  Increased stack size for clients on Netware.
  New libc suggests doing this.

  netware/perror.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqlimport.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqldump.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqld_safe.def
    1.2.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqlcheck.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqlbinlog.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqladmin.def
    1.3.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysql_install_db.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysql.def
    1.3.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/myisampack.def
    1.4.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/myisamlog.def
    1.4.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/my_print_defaults.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/libmysql.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

ChangeSet
  1.2447.1.9 05/12/13 11:48:26 jonas@perch.ndb.mysql.com +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.20 05/12/13 11:48:24 jonas@perch.ndb.mysql.com +0 -13
    Auto merged

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.16 05/12/13 11:48:24 jonas@perch.ndb.mysql.com +0 -4
    Auto merged

  ndb/src/ndbapi/NdbImpl.hpp
    1.9 05/12/13 11:48:23 jonas@perch.ndb.mysql.com +0 -6
    Auto merged

ChangeSet
  1.2447.60.1 05/12/12 21:06:59 aivanov@mysql.com +16 -0
  Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for
   table' lockup".
   Changes from the innodb-4.1-ss11 snapshot.
   Do not call os_file-create_tmpfile() at runtime. Instead, create
   a tempfile at startup and guard access to it with a mutex.
   Also, fix bugs:
   10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
   13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
   KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
   datatypes between foreign key references are compatible.
   Also, added test cases (also for bug 9802).

  sql/ha_innodb.cc
    1.212 05/12/12 21:06:52 aivanov@mysql.com +53 -56
    Changes from the innodb-4.1-ss11 snapshot

  mysql-test/t/innodb.test
    1.77 05/12/12 21:06:52 aivanov@mysql.com +49 -0
    Changes from the innodb-4.1-ss11 snapshot

  mysql-test/r/innodb.result
    1.106 05/12/12 21:06:52 aivanov@mysql.com +32 -0
    Changes from the innodb-4.1-ss11 snapshot

  libmysqld/ha_blackhole.cc
    1.1.1.1 05/12/12 21:06:52 aivanov@mysql.com +0 -0
    Changes from the innodb-4.1-ss11 snapshot

  innobase/srv/srv0start.c
    1.80 05/12/12 21:06:52 aivanov@mysql.com +13 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/srv/srv0srv.c
    1.79 05/12/12 21:06:52 aivanov@mysql.com +6 -0
    Changes from the innodb-4.1-ss11 snapshot

  innobase/row/row0mysql.c
    1.93 05/12/12 21:06:52 aivanov@mysql.com +26 -38
    Changes from the innodb-4.1-ss11 snapshot

  innobase/row/row0ins.c
    1.56 05/12/12 21:06:52 aivanov@mysql.com +34 -34
    Changes from the innodb-4.1-ss11 snapshot

  innobase/rem/rem0cmp.c
    1.24 05/12/12 21:06:52 aivanov@mysql.com +6 -5
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/srv0srv.h
    1.45 05/12/12 21:06:52 aivanov@mysql.com +6 -0
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/rem0cmp.h
    1.5 05/12/12 21:06:52 aivanov@mysql.com +2 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/os0file.h
    1.36 05/12/12 21:06:52 aivanov@mysql.com +1 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/dict0load.h
    1.7 05/12/12 21:06:51 aivanov@mysql.com +2 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/dict0dict.h
    1.33 05/12/12 21:06:51 aivanov@mysql.com +2 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/dict/dict0load.c
    1.33 05/12/12 21:06:51 aivanov@mysql.com +5 -4
    Changes from the innodb-4.1-ss11 snapshot

  innobase/dict/dict0dict.c
    1.65 05/12/12 21:06:51 aivanov@mysql.com +13 -21
    Changes from the innodb-4.1-ss11 snapshot

ChangeSet
  1.2447.58.1 05/12/12 17:51:56 joerg@mysql.com +2 -0
  rpl_until.test + rpl_until.result
  
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com

  mysql-test/t/rpl_until.test
    1.17 05/12/12 17:51:52 joerg@mysql.com +3 -3
    Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
    The value is not important, and it depends on timing. Mask it.
    
    Backport and extension of a fix made by Matthias in 5.0, originally it was
    1.1976 05/12/05 17:57:48 mleich@mysql.com

  mysql-test/r/rpl_until.result
    1.17 05/12/12 17:51:52 joerg@mysql.com +3 -3
    Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
    The value is not important, and it depends on timing. Mask it.
    
    Backport and extension of a fix made by Matthias in 5.0, originally it was
    1.1976 05/12/05 17:57:48 mleich@mysql.com

ChangeSet
  1.2442.11.13 05/12/12 17:19:04 jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#15685
    Error in abort handling in TC when timeout during abort
    

  ndb/test/run-test/daily-basic-tests.txt
    1.24 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +8 -0
    Test case

  ndb/test/ndbapi/testNodeRestart.cpp
    1.13 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +44 -0
    Test case

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.61 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +1 -2
    Dont release transaction record to early

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.56.1.2 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +10 -1
    New error codes

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.12 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +4 -0
    New error codes

ChangeSet
  1.2447.55.2 05/12/11 09:21:13 kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Removed Visual Studio 6 project files, as they are not maintained

  scripts/make_win_src_distribution.sh
    1.36 05/12/11 09:20:21 kent@mysql.com +2 -2
    Removed Visual Studio 6 project files, as they are not maintained

ChangeSet
  1.2447.57.1 05/12/10 18:20:00 holyfoot@deer.(none) +1 -0
  Fix for bug #14320 (MBROverlaps does wrong test)

  sql/spatial.h
    1.15 05/12/10 18:19:15 holyfoot@mysql.com +1 -1
    MBR::inner_point fixed

ChangeSet
  1.2442.11.12 05/12/09 13:51:12 jonas@perch.ndb.mysql.com +4 -0
  bug#15632 - ndb
    Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes

  ndb/test/ndbapi/testNodeRestart.cpp
    1.12 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +60 -0
    Add testcase for bug#15632

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.25.1.2 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +35 -3
    Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
      by also waiting for starting nodes 

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.11 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +2 -0
    New error code for delaying INCL_NODE_REQ 

  ndb/include/ndb_version.h.in
    1.3 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +3 -0
    Handle upgrade of bug fix

ChangeSet
  1.2447.56.1 05/12/09 16:37:58 bar@mysql.com +10 -0
    Bug#15377 Valid multibyte sequences are truncated on INSERT
  ctype-euc_kr.c:
  ctype-gb2312.c:
    Adding specific well_formed_length functions
    for gb2312 and euckr, to allow storing characters
    which are correct according to the character set
    specifications but just don't have Unicode mapping.
    Previously only those which have Unicode mapping
    could be stored, while unassigned characters lead
    to data truncation.
  Many files:
    new file

  strings/ctype-euc_kr.c
    1.61 05/12/09 16:35:57 bar@mysql.com +36 -1
    Adding specific well_formed_length functions
    for gb2312 and euckr, to allow storing characters
    which are correct according to the character set.
    Previously only those which have Unicode mapping
    could be stored.

  strings/ctype-gb2312.c
    1.58 05/12/09 16:34:08 bar@mysql.com +36 -1
    Bug#15377 Valid multibyte sequences are truncated on INSERT
    Adding specific well_formed_length functions
    for gb2312 and euckr, to allow storing characters
    which are correct according to the character set.
    Previously only those which have Unicode mapping
    could be stored.

  mysql-test/t/ctype_gb2312.test
    1.1 05/12/09 16:33:43 bar@mysql.com +33 -0

  mysql-test/t/ctype_euckr.test
    1.1 05/12/09 16:33:43 bar@mysql.com +33 -0

  mysql-test/t/ctype_gb2312.test
    1.0 05/12/09 16:33:43 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/t/ctype_gb2312.test

  mysql-test/t/ctype_euckr.test
    1.0 05/12/09 16:33:43 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/t/ctype_euckr.test

  mysql-test/include/have_gb2312.inc
    1.1 05/12/09 16:33:31 bar@mysql.com +4 -0

  mysql-test/include/have_euckr.inc
    1.1 05/12/09 16:33:31 bar@mysql.com +4 -0

  mysql-test/include/have_gb2312.inc
    1.0 05/12/09 16:33:31 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/include/have_gb2312.inc

  mysql-test/include/have_euckr.inc
    1.0 05/12/09 16:33:31 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/include/have_euckr.inc

  mysql-test/r/have_gb2312.require
    1.1 05/12/09 16:33:14 bar@mysql.com +2 -0

  mysql-test/r/have_euckr.require
    1.1 05/12/09 16:33:14 bar@mysql.com +2 -0

  mysql-test/r/ctype_gb2312.result
    1.1 05/12/09 16:33:14 bar@mysql.com +167 -0

  mysql-test/r/have_gb2312.require
    1.0 05/12/09 16:33:14 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/have_gb2312.require

  mysql-test/r/have_euckr.require
    1.0 05/12/09 16:33:14 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/have_euckr.require

  mysql-test/r/ctype_gb2312.result
    1.0 05/12/09 16:33:14 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/ctype_gb2312.result

  mysql-test/r/ctype_euckr.result
    1.1 05/12/09 16:33:13 bar@mysql.com +167 -0

  mysql-test/r/ctype_euckr.result
    1.0 05/12/09 16:33:13 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/ctype_euckr.result

ChangeSet
  1.2447.18.38 05/12/08 12:33:33 jimw@mysql.com +5 -0
  Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE
  handling so that indexes are closed before trying to commit the
  transaction. (Bug #15536)

  sql/sql_update.cc
    1.148.1.1 05/12/08 12:33:30 jimw@mysql.com +1 -1
    Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

  sql/sql_insert.cc
    1.172 05/12/08 12:33:30 jimw@mysql.com +6 -3
    Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

  sql/sql_delete.cc
    1.138 05/12/08 12:33:29 jimw@mysql.com +1 -1
    Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

  mysql-test/t/bdb.test
    1.41 05/12/08 12:33:29 jimw@mysql.com +19 -1
    Add new test

  mysql-test/r/bdb.result
    1.44 05/12/08 12:33:29 jimw@mysql.com +19 -0
    Add new results

ChangeSet
  1.2447.55.1 05/12/08 16:13:53 kent@mysql.com +2 -0
  mysqld.cc:
    Bug#14960, reverted code to make symdir work on Windows
  symlink.test:
    Disabled test case on Windows

  sql/mysqld.cc
    1.607 05/12/08 16:13:30 kent@mysql.com +2 -2
    Bug#14960, reverted code to make symdir work on Windows

ChangeSet
  1.2442.11.11 05/12/08 15:29:39 jonas@perch.ndb.mysql.com +1 -0
  bug#15587 - ndb
    Fix typo in autotest script

  ndb/test/run-test/daily-basic-tests.txt
    1.23 05/12/08 15:29:37 jonas@perch.ndb.mysql.com +1 -1
    Fix typo in autotest script

ChangeSet
  1.2442.11.10 05/12/08 15:28:15 jonas@perch.ndb.mysql.com +7 -0
  bug#15587 - ndb
    Fix error in NF during NR

  ndb/test/run-test/daily-basic-tests.txt
    1.22 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +4 -0
    Add testcase for bug#15587

  ndb/test/ndbapi/testNodeRestart.cpp
    1.11 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +45 -0
    Add testcase for bug#15587

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.56.1.1 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +7 -2
    Add dump for ERROR 5002 with specified table

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.30 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +1 -0
    Add dump for ERROR 5002 with specified table

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.25.1.1 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +12 -2
    Run updateNodeInfo if failed node is not in list of storedReplicas

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.10 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +3 -0
    Add dump for ERROR 5002 with specified table

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.5 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +2 -0
    Add dump for ERROR 5002 with specified table

ChangeSet
  1.2447.54.2 05/12/07 19:57:56 ingo@mysql.com +8 -0
  Merge mysql.com:/home/mydev/mysql-4.0-bug5390
  into  mysql.com:/home/mydev/mysql-4.1-bug5390

  sql/sql_parse.cc
    1.474 05/12/07 19:57:53 ingo@mysql.com +4 -6
    BUG#5390 - problems with merge tables
    Manual merge.

  mysql-test/t/merge.test
    1.38 05/12/07 19:57:53 ingo@mysql.com +0 -26
    BUG#5390 - problems with merge tables
    Manual merge.

  sql/sql_update.cc
    1.150 05/12/07 19:54:07 ingo@mysql.com +0 -1
    Auto merged

  sql/mysql_priv.h
    1.373 05/12/07 19:54:07 ingo@mysql.com +0 -1
    Auto merged

  sql/lock.cc
    1.63 05/12/07 19:54:06 ingo@mysql.com +0 -86
    Auto merged

  mysql-test/t/create.test
    1.57.1.7 05/12/07 19:54:06 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/r/merge.result
    1.40 05/12/07 19:54:06 ingo@mysql.com +0 -49
    Auto merged

  mysql-test/r/create.result
    1.84.1.6 05/12/07 19:54:06 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.54.1 05/12/07 19:52:26 ingo@mysql.com +9 -0
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 4.1.
  INSERT ... SELECT with the same table on both sides (hidden
  below a MERGE table) does now work by buffering the select result.
  The duplicate detection works now after open_and_lock_tables() 
  on the locks.
  I did not find a test case that failed without the change in
  sql_update.cc. I made the change anyway as it should in theory
  fix a possible MERGE table problem with multi-table update.

  sql/sql_update.cc
    1.149 05/12/07 19:52:19 ingo@mysql.com +1 -2
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Changed the duplicate tables detection for UPDATE
    to use the new function, which does also work for MERGE tables.

  sql/sql_parse.cc
    1.473 05/12/07 19:52:18 ingo@mysql.com +6 -5
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Changed the duplicate tables detection for INSERT ... SELECT
    to use the new function, which does also work for MERGE tables.

  sql/mysql_priv.h
    1.372 05/12/07 19:52:18 ingo@mysql.com +1 -0
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added a declaration for the new function.

  sql/lock.cc
    1.62 05/12/07 19:52:18 ingo@mysql.com +86 -3
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added a new function to find a duplicate lock in a list of tables.

  mysql-test/t/merge.test
    1.37 05/12/07 19:52:18 ingo@mysql.com +26 -0
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added tests.

  mysql-test/t/create.test
    1.57.1.6 05/12/07 19:52:18 ingo@mysql.com +0 -7
    BUG#5390 - problems with merge tables
    Removed a duplicate test.

  mysql-test/r/merge.result
    1.39 05/12/07 19:52:18 ingo@mysql.com +49 -0
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added test results.

  mysql-test/r/create.result
    1.84.1.5 05/12/07 19:52:18 ingo@mysql.com +0 -15
    BUG#5390 - problems with merge tables
    Removed a duplicate test.

  libmysqld/ha_blackhole.cc
    1.2 05/12/07 19:52:18 ingo@mysql.com +0 -0
    BUG#5390 - problems with merge tables
    No idea, how the symlink change made it into my patch.

ChangeSet
  1.2447.53.1 05/12/07 18:48:46 bar@mysql.com +1 -0
    Bug#13421 problem with sorting turkish
  latin5.xml:
    - Fixing order thee Turkish letters to conform Turkish rules.
    - All non-Turkish accented letters are mappend
      to their non-accented counterparts.

  sql/share/charsets/latin5.xml
    1.6 05/12/07 18:46:12 bar@mysql.com +4 -9
    Bug#13421 problem with sorting turkish
    Fixing order to conform the Turkish rules.
    All non-Turkish accented letters are mappend to
    the non-accented counterparts.

ChangeSet
  1.2447.52.1 05/12/07 15:45:31 msvensson@neptunus.(none) +3 -0
  BUG#9535 Warning for "create table t as select uuid();"
     - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
      Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5()
  etc will use 'ascii'
      - Comitting again, the old patch seems to have been lost.

  sql/item_strfunc.h
    1.100 05/12/07 15:45:28 msvensson@neptunus.(none) +6 -1
    Multiply max_length of Item_func_uuid with system_charset_info->mbmaxlen

  mysql-test/t/func_misc.test
    1.13 05/12/07 15:45:28 msvensson@neptunus.(none) +5 -0
    Test case

  mysql-test/r/func_misc.result
    1.17 05/12/07 15:45:28 msvensson@neptunus.(none) +8 -0
    Test results updated

ChangeSet
  1.2447.49.7 05/12/07 11:11:59 stewart@mysql.com +1 -0
  New tool to collate all information to form a good error report for NDB.
  
  It will copy from each node the logs and trace dumps (if any) and create
  a tarball. Having this tarball attached to a bug report greatly helps
  troubleshooting and avoids user error.
  
  It will (optionally) also get the filesystem.

  ndb/tools/ndb_error_reporter
    1.1 05/12/07 11:11:56 stewart@mysql.com +88 -0
    New BitKeeper file ``ndb/tools/ndb_error_reporter''

  ndb/tools/ndb_error_reporter
    1.0 05/12/07 11:11:56 stewart@mysql.com +0 -0
    BitKeeper file /home/stewart/Documents/MySQL/4.1/cleanup/ndb/tools/ndb_error_reporter

ChangeSet
  1.2447.18.35 05/12/07 06:46:43 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0
  into  mysql.com:/space/my/mysql-4.1

  BitKeeper/triggers/post-commit
    1.34 05/12/07 06:46:39 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.864.1 05/12/06 17:48:31 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-4.0
  into  mysql.com:/home/mydev/mysql-4.0-bug5390

  sql/sql_parse.cc
    1.218.44.6 05/12/06 17:47:56 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.818 05/12/06 14:07:23 lenz@mysql.com +1 -0
   - commit emails are now sent to commits@lists.mysql.com instead of 
     internals@lists.mysql.com to reduce the noise on the internals list.

  BitKeeper/triggers/post-commit
    1.19.1.16 05/12/06 14:07:21 lenz@mysql.com +4 -4
     - commit emails are now sent to commits@lists.mysql.com instead of 
       internals@lists.mysql.com to reduce the noise on the internals list.

  mysql-test/t/symlink.test
    1.15 05/12/06 00:40:52 kent@mysql.com +2 -0
    Disabled test case on Windows

ChangeSet
  1.2447.18.34 05/12/05 17:53:42 joerg@mysql.com +1 -0
  Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
  (Backport of an identical change from 5.0)

  support-files/mysql.spec.sh
    1.112 05/12/05 17:53:38 joerg@mysql.com +8 -2
    We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
    The fully static RPM build on "build" also does not work with the bundled zlib.
    With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
    and the one already installed on the system for the "max" build which is also labeled "experimental".
    (Backport of an identical change from 5.0)

ChangeSet
  1.2447.18.33 05/12/05 17:10:43 joerg@mysql.com +1 -0
  Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1

  scripts/make_binary_distribution.sh
    1.89 05/12/05 17:10:41 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.18.32 05/12/04 15:39:44 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Fixes multi_statement test case on NetWare.

  netware/mysql_test_run.c
    1.15 05/12/04 15:39:39 jani@a193-229-222-105.elisa-laajakaista.fi +4 -0
    Fixes multi_statement test case on NetWare.

ChangeSet
  1.2447.18.31 05/12/04 15:34:47 jani@a193-229-222-105.elisa-laajakaista.fi +13 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  sql/sql_parse.cc
    1.472 05/12/04 15:34:43 jani@a193-229-222-105.elisa-laajakaista.fi +3 -3
    Merged from 4.0.

  sql/mysqld.cc
    1.606 05/12/04 15:32:55 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.371 05/12/04 15:32:55 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  myisam/myisampack.c
    1.43 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  myisam/myisamchk.c
    1.130 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  isam/isamchk.c
    1.35 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlshow.c
    1.40 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlimport.c
    1.53 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.197 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlcheck.c
    1.49 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.107 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqladmin.cc
    1.107 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysql.cc
    1.216 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqladmin.cc
    1.66.4.2 05/12/04 15:32:53 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merge rename: client/mysqladmin.c -> client/mysqladmin.cc

ChangeSet
  1.1346.1.817 05/12/04 15:02:06 jani@a193-229-222-105.elisa-laajakaista.fi +11 -0
  A set of Netware related patches.

  sql/sql_parse.cc
    1.218.45.1 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
    Fix problem with kill connection on NetWare.
    

  myisam/myisampack.c
    1.22.1.15 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  myisam/myisamchk.c
    1.80.1.37 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  isam/isamchk.c
    1.21.1.5 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlshow.c
    1.25.1.6 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlimport.c
    1.29.1.9 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqldump.c
    1.65.1.55 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlcheck.c
    1.25.1.8 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlbinlog.cc
    1.70.1.35 05/12/04 15:02:02 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqladmin.c
    1.66.4.1 05/12/04 15:02:02 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysql.cc
    1.93.1.68 05/12/04 15:02:02 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

ChangeSet
  1.2447.18.29 05/12/02 09:27:06 stewart@mysql.com +2 -0
  BUG#15425 Small window for NF during backup failing without error

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.43 05/12/02 09:27:03 stewart@mysql.com +0 -1
    Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.21.1.1 05/12/02 09:27:03 stewart@mysql.com +10 -5
    If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
    all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
    error in FSAPPENDCONF is hit.
    
    This would mean that no error code was set for the backup and that it would
    be incomplete as not all IO had been written to disk before the node crash.
    This would not be reported to the user.
    
    So the backup would appear to succeed but it really didn't.
    
    The window for this is rather small though.

ChangeSet
  1.2447.51.1 05/12/01 23:22:20 evgen@moonbone.local +3 -0
  Fix bug#15028  Multitable update returns different numbers of matched rows
  depending on table order
  
  multi_update::send_data() was counting updates, not updated rows. Thus if one 
  record have several updates it will be counted several times in 'rows matched'
  but updated only once.
  
  multi_update::send_data() now counts only unique rows.

  mysql-test/r/update.result
    1.28 05/12/01 23:20:44 evgen@moonbone.local +13 -0
    Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order

  mysql-test/t/update.test
    1.26 05/12/01 23:20:10 evgen@moonbone.local +17 -0
    Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order

  sql/sql_update.cc
    1.148 05/12/01 23:19:06 evgen@moonbone.local +7 -6
    Fix bug#15028  Multitable update returns different numbers of matched rows
    depending on table order
    multi_update::send_data() now counts only unique rows.

ChangeSet
  1.2447.49.6 05/12/01 14:55:25 stewart@mysql.com +1 -0
  Backup.cpp:
    convert comment to english

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.22 05/12/01 14:55:04 stewart@mysql.com +1 -1
    convert comment to english

ChangeSet
  1.2447.18.28 05/12/01 14:26:19 bell@sanja.is.com.ua +3 -0
  We should skip beggining '(' characters when test query on possibility
  to be in the query cache. (BUG#14652)

  sql/sql_cache.cc
    1.95 05/12/01 14:26:17 bell@sanja.is.com.ua +19 -9
    We should skip beggining '(' characters when test query on possibility
    to be in the query cache.

  mysql-test/t/query_cache.test
    1.48 05/12/01 14:26:16 bell@sanja.is.com.ua +15 -0
    BUG#14652 test suite.

  mysql-test/r/query_cache.result
    1.60 05/12/01 14:26:16 bell@sanja.is.com.ua +25 -0
    BUG#14652 test suite.

ChangeSet
  1.2447.18.27 05/11/30 21:50:09 joerg@mysql.com +1 -0
  Raise the version number (as 4.1.16 has been cloned).

  configure.in
    1.400 05/11/30 21:50:04 joerg@mysql.com +2 -2
    Raise the version number (as 4.1.16 has been cloned).

ChangeSet
  1.2447.49.5 05/11/30 14:18:43 stewart@mysql.com +1 -0
  DblqhMain.cpp:
    Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.
  
  Makes it easier to grep for senders of signals to specific blocks

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.57 05/11/30 14:17:24 stewart@mysql.com +12 -18
    Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.

ChangeSet
  1.2447.18.26 05/11/29 11:52:58 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-14216
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/item.cc
    1.230 05/11/29 11:52:56 jimw@mysql.com +0 -0
    Auto merged

