ChangeSet
  1.2139 06/02/08 19:01:54 joerg@mysql.com +2 -0
  Link errors in 5.1.6 on Solaris in debug builds, overcome by not building two NDB test programs.

  storage/ndb/src/kernel/blocks/dbtup/Makefile.am
    1.8 06/02/08 19:01:48 joerg@mysql.com +1 -1
    Fix proposed by Jonas Oreland: Stop building "test_varpage", it is just for testing.

  storage/ndb/src/kernel/blocks/Makefile.am
    1.6 06/02/08 19:01:48 joerg@mysql.com +1 -1
    Fix proposed by Jonas Oreland: Stop building "ndb_print_file", it is just for testing.

ChangeSet
  1.2136.1.1 06/02/08 11:59:45 jonas@perch.ndb.mysql.com +1 -0
  5.1.6 release ndb dd - fix problem with O_DIRECT on some platforms

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.27 06/02/08 11:59:42 jonas@perch.ndb.mysql.com +14 -2
    reopen wo/ O_DIRECT if firts write fails

ChangeSet
  1.2137 06/02/08 11:42:17 knielsen@mysql.com +1 -0
  Modified RPM spec to match new 5.1 debug+max combined community packaging.

  support-files/mysql.spec.sh
    1.123 06/02/08 11:42:05 knielsen@mysql.com +53 -127
    Modified RPM spec to match new 5.1 debug+max combined community packaging.

ChangeSet
  1.2136 06/02/07 22:39:55 kent@mysql.com +2 -0
  sql_plugin.cc:
    Bug#17196, --default-storage-engine option broken
  configure.in:
    This is an alpha

  sql/sql_plugin.cc
    1.11 06/02/07 22:31:31 kent@mysql.com +1 -1
    Bug#17196, --default-storage-engine option broken

  configure.in
    1.335 06/02/07 22:19:18 kent@mysql.com +1 -1
    This is an alpha

ChangeSet
  1.2130.2.2 06/02/07 19:06:55 joerg@mysql.com +1 -0
  scripts/make_binary_distribution.sh  :  Care about the debug server in the 5.1 packages.

  scripts/make_binary_distribution.sh
    1.108 06/02/07 19:06:49 joerg@mysql.com +10 -8
    As of 5.1, any package will contain both an optimized and a debugging server,
    built with identical configuration (features / table handlers).
    This "mysqld-debug" must be contained in the package.
    Also, the server will not be stripped any more.
    Also, get rid of the old compatibility symlink "safe_mysqld" dating back to 4.0.

ChangeSet
  1.2130.2.1 06/02/07 17:42:04 joerg@mysql.com +1 -0
  scripts/make_binary_distribution.sh  :
  Adaption of the 5.1.6 build clone to the new "storage" directory layer,
  already done in the general tree by Jani.

  scripts/make_binary_distribution.sh
    1.107 06/02/07 17:41:58 joerg@mysql.com +2 -2
    Adaption of the 5.1.6 build clone to the new "storage" directory layer,
    already done in the general tree by Jani:
        2006/02/02 16:22:22+02:00 jani@ua141d10.elisa.omakaista.fi +2 -2
        Fix to reflect change in directory structure.

ChangeSet
  1.2130.1.1 06/02/07 16:30:26 knielsen@mysql.com +1 -0
  Add cast to fix Windows compilation.

  sql/sql_show.cc
    1.298 06/02/07 16:11:20 knielsen@mysql.com +1 -1
    Add cast for Windows.

ChangeSet
  1.2132 06/02/06 18:36:13 petr@mysql.com +1 -0
  post-merge fix

  sql/mysqld.cc
    1.528 06/02/06 18:36:09 petr@mysql.com +1 -1
    post-merge fix

ChangeSet
  1.2131 06/02/06 17:35:10 petr@mysql.com +5 -0
  Merge mysqldev@production.mysql.com:my/mysql-5.1-release
  into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug

  sql/mysqld.cc
    1.527 06/02/06 17:35:05 petr@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.376 06/02/06 17:35:05 petr@mysql.com +0 -0
    Auto merged

  sql/log.h
    1.4 06/02/06 17:35:05 petr@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.190 06/02/06 17:35:05 petr@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.59 06/02/06 17:35:05 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2071.20.3 06/02/06 17:30:44 petr@mysql.com +1 -0
  cleanup

  sql/mysql_priv.h
    1.374.1.1 06/02/06 17:30:40 petr@mysql.com +0 -1
    remove reference to variable removed in the previous patch

ChangeSet
  1.2071.20.2 06/02/06 14:31:43 petr@mysql.com +1 -0
  post-review fixes to WL#3117 Change option handling
  for the log tables.

  sql/mysqld.cc
    1.526 06/02/06 14:31:40 petr@mysql.com +20 -5
    post-review fixes

ChangeSet
  1.2130 06/02/03 01:49:33 anozdrin@mysql.com +2 -0
  Copied patch for BUG#15588 (BUG#16621) from 5.0 into 5.1-release.

  sql/sp_head.cc
    1.213 06/02/03 01:49:29 anozdrin@mysql.com +25 -12
    Work correctly with String:
    - String length has to be be reset before use;
    - qs_append() does not allocate memory, so the memory should
      be reserved beforehand.

  sql/field.cc
    1.298 06/02/03 01:49:29 anozdrin@mysql.com +2 -2
    Use memmove() instead of memcpy() -- after implementation of WL#2984
    (Make stored routine variables work according to the standard) it is
    possible to store in the field the value from this field. For instance,
    this can happen for the following statement:
      SET sp_var = SUBSTR(sp_var, 1, 3);

ChangeSet
  1.2129 06/02/02 19:40:58 joerg@mysql.com +1 -0
  storage/example/ha_example.cc
      Copied from the general tree, to solve a build problem:
      ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
        build fix when building with example storage engine.

  storage/example/ha_example.cc
    1.31 06/02/02 19:40:52 joerg@mysql.com +1 -0
    Copied from the general tree, to solve a build problem:
    ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
      build fix when building with example storage engine.

ChangeSet
  1.2122.1.1 06/02/02 13:36:07 dlenev@mysql.com +3 -0
  Yet another addition to the fix for BUG#9412 "Triggers: should have trigger
  privilege".
  
  Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
  Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
  tests but they were disabled. Enabled them back.

  scripts/mysql_fix_privilege_tables.sql
    1.40 06/02/02 13:35:58 dlenev@mysql.com +5 -1
    Corrected addition of TRIGGER privilege.

  mysql-test/t/disabled.def
    1.52 06/02/02 13:35:57 dlenev@mysql.com +0 -2
    Enabled back test system_mysql_db/system_mysql_db_fix tests.

  mysql-test/r/system_mysql_db.result
    1.38 06/02/02 13:35:57 dlenev@mysql.com +4 -1
    Updated test results after addition of TRIGGER privilege.

ChangeSet
  1.2127 06/02/02 10:56:04 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #16753    DD: mysqldump does not support Cluster Disk Data backups

  mysql-test/t/ndb_dd_dump.test
    1.2 06/02/02 10:55:57 tomas@poseidon.ndb.mysql.com +13 -3
    Bug #16753    DD: mysqldump does not support Cluster Disk Data backups

  mysql-test/r/ndb_dd_dump.result
    1.2 06/02/02 10:55:57 tomas@poseidon.ndb.mysql.com +21 -12
    Bug #16753    DD: mysqldump does not support Cluster Disk Data backups

  client/mysqldump.c
    1.222 06/02/02 10:55:57 tomas@poseidon.ndb.mysql.com +48 -35
    Bug #16753    DD: mysqldump does not support Cluster Disk Data backups

ChangeSet
  1.2126 06/02/02 00:52:58 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #16753  	DD: mysqldump does not support Cluster Disk Data backups

  mysql-test/t/ndb_dd_dump.test
    1.1 06/02/02 00:52:51 tomas@poseidon.ndb.mysql.com +249 -0
    New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''

  mysql-test/r/ndb_dd_dump.result
    1.1 06/02/02 00:52:51 tomas@poseidon.ndb.mysql.com +221 -0
    New BitKeeper file ``mysql-test/r/ndb_dd_dump.result''

  mysql-test/t/ndb_dd_dump.test
    1.0 06/02/02 00:52:51 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-release/mysql-test/t/ndb_dd_dump.test

  mysql-test/r/ndb_dd_dump.result
    1.0 06/02/02 00:52:51 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-release/mysql-test/r/ndb_dd_dump.result

  client/mysqldump.c
    1.221 06/02/02 00:52:51 tomas@poseidon.ndb.mysql.com +121 -1
    Bug #16753  	DD: mysqldump does not support Cluster Disk Data backups

ChangeSet
  1.2125 06/02/02 00:24:42 tomas@poseidon.ndb.mysql.com +1 -0
  bug, added error handling to information_schema files

  sql/ha_ndbcluster.cc
    1.256 06/02/02 00:24:35 tomas@poseidon.ndb.mysql.com +46 -24
    bug, added error handling to information_schema files

ChangeSet
  1.2124 06/02/01 23:55:04 tomas@poseidon.ndb.mysql.com +1 -0
  bug, retry handling in "ndb schema propagation" incorrect

  sql/ha_ndbcluster_binlog.cc
    1.10 06/02/01 23:54:57 tomas@poseidon.ndb.mysql.com +12 -6
    bug, retry handling in "ndb schema propagation" incorrect

ChangeSet
  1.2123 06/02/01 22:37:25 tomas@poseidon.ndb.mysql.com +1 -0
  bug, ndb onject on thread unitialized on handlerton call in files information schema  

  sql/ha_ndbcluster.cc
    1.255 06/02/01 22:37:19 tomas@poseidon.ndb.mysql.com +1 -2
    bug, ndb onject on thread unitialized on handlerton call in files information schema  

ChangeSet
  1.2122 06/02/01 21:27:12 dlenev@mysql.com +2 -0
  Addition to the fix for BUG#9412 "Triggers: should have trigger privilege".
  
  When we add new privilege we should update mysql-test/lib/init_db.sql
  accordingly.

  sql/sql_acl.h
    1.47 06/02/01 21:27:04 dlenev@mysql.com +1 -0
    Updated comment describing process of addition of new privileges - added yet
    another script place which should be modified when new privilege is added.

  mysql-test/lib/init_db.sql
    1.24 06/02/01 21:27:04 dlenev@mysql.com +9 -6
    Added TRIGGER privilege.

ChangeSet
  1.2120 06/02/02 00:52:32 stewart@mysql.com +4 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359
  into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge

  sql/sql_show.cc
    1.297 06/02/02 00:52:27 stewart@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.187 06/02/02 00:52:27 stewart@mysql.com +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.254 06/02/02 00:52:27 stewart@mysql.com +0 -0
    Auto merged

  mysql-test/r/information_schema.result
    1.106 06/02/02 00:52:27 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2119 06/02/02 00:47:08 stewart@mysql.com +5 -0
  some fixes from review of WL1359.
  fix up test cases.

  sql/table.h
    1.127 06/02/02 00:47:04 stewart@mysql.com +1 -0
    add SCH_FILES to information schema enum

  sql/sql_show.cc
    1.296 06/02/02 00:47:04 stewart@mysql.com +1 -1
    correct DBUG_ENTER for fill_schema_files

  sql/ha_ndbcluster.cc
    1.253 06/02/02 00:47:03 stewart@mysql.com +2 -2
    in fill_files_table, use my_snprintf instead of snprintf

  mysql-test/r/information_schema_db.result
    1.11 06/02/02 00:47:03 stewart@mysql.com +1 -0
    update result for INFORMATION_SCHEMA.FILES

  mysql-test/r/information_schema.result
    1.104.1.1 06/02/02 00:47:03 stewart@mysql.com +10 -2
    update result for INFORMATION_SCHEMA.FILES

ChangeSet
  1.2117.1.7 06/02/01 13:30:56 knielsen@mysql.com +1 -0
  Change 5.1.6 from alpha to beta release

  configure.in
    1.334 06/02/01 13:30:37 knielsen@mysql.com +1 -1
    Change 5.1.6 from alpha to beta release

ChangeSet
  1.2117.1.6 06/02/01 13:16:36 tomas@poseidon.ndb.mysql.com +1 -0
  added check if replication already setup by autodiscover

  sql/ha_ndbcluster_binlog.cc
    1.9 06/02/01 13:16:29 tomas@poseidon.ndb.mysql.com +6 -0
    added check if replication already setup by autodiscover

ChangeSet
  1.2117.1.5 06/02/01 13:04:47 tomas@poseidon.ndb.mysql.com +3 -0
  Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql51

  sql/sql_show.cc
    1.293.1.4 06/02/01 13:04:40 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  sql/ha_ndbcluster.h
    1.116 06/02/01 13:04:39 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.251.1.2 06/02/01 13:04:39 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2117.3.4 06/02/01 12:30:36 tomas@poseidon.ndb.mysql.com +2 -0
  another attempt to make testcase predictable :)

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.4 06/02/01 12:30:30 tomas@poseidon.ndb.mysql.com +0 -1
    another attempt to make testcase predictable :)

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.4 06/02/01 12:30:30 tomas@poseidon.ndb.mysql.com +0 -7
    another attempt to make testcase predictable :)

ChangeSet
  1.2117.3.3 06/02/01 12:12:48 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
  corrected test case

  mysql-test/r/ndb_dd_disk2memory.result
    1.3 06/02/01 12:12:40 tomas@poseidon.ndb.mysql.com +2 -2
    Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
    corrected test case

ChangeSet
  1.2117.3.2 06/02/01 12:01:52 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
  correction

  sql/ha_ndbcluster.cc
    1.251.2.2 06/02/01 12:01:44 tomas@poseidon.ndb.mysql.com +1 -2
    Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK
    correction

ChangeSet
  1.2117.3.1 06/02/01 11:56:20 tomas@poseidon.ndb.mysql.com +9 -0
  MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  storage/ndb/tools/restore/consumer_restore.cpp
    1.26 06/02/01 11:56:13 tomas@poseidon.ndb.mysql.com +3 -3
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.48 06/02/01 11:56:13 tomas@poseidon.ndb.mysql.com +18 -3
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.65 06/02/01 11:56:13 tomas@poseidon.ndb.mysql.com +2 -1
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/sql_show.cc
    1.293.2.1 06/02/01 11:56:13 tomas@poseidon.ndb.mysql.com +3 -1
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/handler.h
    1.185.1.1 06/02/01 11:56:13 tomas@poseidon.ndb.mysql.com +2 -2
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/ha_ndbcluster.h
    1.114.1.1 06/02/01 11:56:13 tomas@poseidon.ndb.mysql.com +1 -1
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/ha_ndbcluster.cc
    1.251.2.1 06/02/01 11:56:13 tomas@poseidon.ndb.mysql.com +28 -15
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  mysql-test/t/ndb_dd_basic.test
    1.5 06/02/01 11:56:12 tomas@poseidon.ndb.mysql.com +2 -0
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  mysql-test/r/ndb_dd_basic.result
    1.5 06/02/01 11:56:12 tomas@poseidon.ndb.mysql.com +8 -0
    MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

ChangeSet
  1.2117.2.1 06/02/01 13:28:45 anozdrin@mysql.com +16 -0
  Fix for BUG#9412: Triggers: should have trigger privilege.
  
  Implement table-level TRIGGER privilege to control access to triggers.
  Before this path global SUPER privilege was used for this purpose, that
  was the big security problem.
  
  In details, before this patch SUPER privilege was required:
    - for the user at CREATE TRIGGER time to create a new trigger;
    - for the user at DROP TRIGGER time to drop the existing trigger;
    - for the definer at trigger activation time to execute the trigger (if the
      definer loses SUPER privilege, all its triggers become unavailable);
  
  This patch changes the behaviour in the following way:
    - TRIGGER privilege on the subject table for trigger is required:
      - for the user at CREATE TRIGGER time to create a new trigger;
      - for the user at DROP TRIGGER time to drop the existing trigger;
      - for the definer at trigger activation time to execute the trigger
        (if the definer loses TRIGGER privilege on the subject table, all its
        triggers on this table become unavailable).
    - SUPER privilege is still required:
      - for the user at CREATE TRIGGER time to explicitly set the trigger
        definer to the user other than CURRENT_USER().
  
  When the server works with database of the previous version (w/o TRIGGER
  privilege), or if the database is being upgraded from the previous versions,
  TRIGGER privilege is granted to whose users, who have CREATE privilege.

  sql/sql_yacc.yy
    1.448 06/02/01 13:28:40 anozdrin@mysql.com +1 -0
    Added TRIGGER privilege.

  sql/sql_trigger.cc
    1.44 06/02/01 13:28:40 anozdrin@mysql.com +25 -23
    Check TRIGGER privilege instead of SUPER.

  sql/sql_show.cc
    1.293.1.3 06/02/01 13:28:40 anozdrin@mysql.com +1 -0
    Added TRIGGER privilege.

  sql/sql_acl.h
    1.46 06/02/01 13:28:40 anozdrin@mysql.com +10 -6
    Added TRIGGER privilege.

  sql/sql_acl.cc
    1.176 06/02/01 13:28:40 anozdrin@mysql.com +8 -2
    Added TRIGGER privilege.

  scripts/mysql_fix_privilege_tables.sql
    1.39 06/02/01 13:28:40 anozdrin@mysql.com +9 -0
    Added TRIGGER privilege.

  scripts/mysql_create_system_tables.sh
    1.37 06/02/01 13:28:40 anozdrin@mysql.com +12 -9
    Added TRIGGER privilege.

  mysql-test/t/trigger-grant.test
    1.4 06/02/01 13:28:40 anozdrin@mysql.com +140 -10
    1. Grant table-level TRIGGER privilege instead of global SUPER one.
    2. Updated the test case to check that SUPER is required to specify
    the user other than the current as a definer.

  mysql-test/t/trigger-compat.test
    1.4 06/02/01 13:28:40 anozdrin@mysql.com +1 -2
    Grant table-level TRIGGER privilege instead of global SUPER one.

  mysql-test/r/trigger-grant.result
    1.3 06/02/01 13:28:40 anozdrin@mysql.com +57 -2
    Updated the result file after adding TRIGGER privilege.

  mysql-test/r/trigger-compat.result
    1.3 06/02/01 13:28:40 anozdrin@mysql.com +1 -2
    Updated the result file after adding TRIGGER privilege.

  mysql-test/r/sp.result
    1.181 06/02/01 13:28:40 anozdrin@mysql.com +2 -0
    Updated the result file after adding TRIGGER privilege.

  mysql-test/r/ps.result
    1.60 06/02/01 13:28:40 anozdrin@mysql.com +3 -3
    Updated the result file after adding TRIGGER privilege.

  mysql-test/r/lowercase_table_grant.result
    1.4 06/02/01 13:28:40 anozdrin@mysql.com +4 -4
    Updated the result file after adding TRIGGER privilege.

  mysql-test/r/information_schema.result
    1.105 06/02/01 13:28:40 anozdrin@mysql.com +1 -0
    Updated the result file after adding TRIGGER privilege.

  mysql-test/r/grant.result
    1.48 06/02/01 13:28:40 anozdrin@mysql.com +14 -13
    Updated the result file after adding TRIGGER privilege.

ChangeSet
  1.2117.1.3 06/02/01 10:21:48 marty@linux.site +2 -0
  Wrapped get/set_ndb_share_state with mutex lock

  sql/ha_ndbcluster.h
    1.115 06/02/01 10:21:10 marty@linux.site +20 -0
    Wrapped get/set_ndb_share_state with mutex lock

  sql/ha_ndbcluster.cc
    1.251.1.1 06/02/01 10:21:10 marty@linux.site +10 -9
    Wrapped get/set_ndb_share_state with mutex lock

ChangeSet
  1.2117.1.2 06/02/01 10:13:27 tomas@poseidon.ndb.mysql.com +1 -0
  bug 16996 ndbd nodes crash at api heartbeat failure if event/replication is used

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.34 06/02/01 10:13:21 tomas@poseidon.ndb.mysql.com +9 -1
    bug 16996 ndbd nodes crash at api heartbeat failure if event/replication is used

ChangeSet
  1.2117.1.1 06/02/01 10:07:04 tomas@poseidon.ndb.mysql.com +2 -0
  adjust test to give predictable output

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.3 06/02/01 10:06:57 tomas@poseidon.ndb.mysql.com +6 -8
    adjust test to give predictable output

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.3 06/02/01 10:06:57 tomas@poseidon.ndb.mysql.com +6 -19
    adjust test to give predictable output

ChangeSet
  1.2118 06/02/01 18:23:34 stewart@mysql.com +6 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
  into  mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359

  sql/sql_show.cc
    1.295 06/02/01 18:23:30 stewart@mysql.com +0 -0
    SCCS merged

  sql/log.cc
    1.188.1.2 06/02/01 18:22:46 stewart@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.186 06/02/01 18:22:46 stewart@mysql.com +0 -0
    Auto merged

  sql/ha_partition.cc
    1.27 06/02/01 18:22:46 stewart@mysql.com +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.252 06/02/01 18:22:45 stewart@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.252 06/02/01 18:22:45 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2117 06/02/01 02:34:02 tomas@poseidon.ndb.mysql.com +2 -0
  ensure repeatability of test case

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.2 06/02/01 02:33:55 tomas@poseidon.ndb.mysql.com +2 -2
    ensure repeatability of test case

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.2 06/02/01 02:33:55 tomas@poseidon.ndb.mysql.com +1 -1
    ensure repeatability of test case

ChangeSet
  1.2113.2.1 06/02/01 01:12:11 tomas@poseidon.ndb.mysql.com +11 -0
    wl2325, distribution of schema operations between mysql servers

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.1 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +146 -0
    New BitKeeper file ``mysql-test/t/ndb_binlog_ddl_multi.test''

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.1 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +145 -0
    New BitKeeper file ``mysql-test/r/ndb_binlog_ddl_multi.result''

  sql/ha_ndbcluster_binlog.h
    1.5 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +4 -2
      wl2325, distribution of schema operations between mysql servers

  sql/ha_ndbcluster_binlog.cc
    1.8 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +98 -27
      wl2325, distribution of schema operations between mysql servers

  sql/ha_ndbcluster.cc
    1.251 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +26 -19
      wl2325, distribution of schema operations between mysql servers

  mysql-test/t/ndb_multi_row.test
    1.2 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +0 -2
      wl2325, distribution of schema operations between mysql servers

  mysql-test/t/ndb_database.test
    1.3 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +0 -28
      wl2325, distribution of schema operations between mysql servers

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.0 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql51/mysql-test/t/ndb_binlog_ddl_multi.test

  mysql-test/t/ndb_alter_table_row.test
    1.5 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +0 -3
      wl2325, distribution of schema operations between mysql servers

  mysql-test/r/ndb_multi_row.result
    1.2 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +0 -6
      wl2325, distribution of schema operations between mysql servers

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.0 06/02/01 01:12:04 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql51/mysql-test/r/ndb_binlog_ddl_multi.result

  mysql-test/r/ndb_database.result
    1.2 06/02/01 01:12:03 tomas@poseidon.ndb.mysql.com +0 -14
      wl2325, distribution of schema operations between mysql servers

  mysql-test/r/ndb_alter_table_row.result
    1.5 06/02/01 01:12:03 tomas@poseidon.ndb.mysql.com +0 -2
      wl2325, distribution of schema operations between mysql servers

ChangeSet
  1.2113.1.1 06/02/01 02:19:14 sergefp@mysql.com +1 -0
  Change DBUG_ASSERT(1) to DBUG_ASSERT(0)

  mysys/my_bitmap.c
    1.37 06/02/01 02:19:08 sergefp@mysql.com +4 -4
    Change DBUG_ASSERT(1) to DBUG_ASSERT(0)

ChangeSet
  1.2105.4.1 06/01/31 23:29:03 andrey@lmy004. +1 -0
  sql_mode should be after on_completion and before comment
  partial fix for bug #16407
  WL#1034 (Internal CRON)

  scripts/mysql_fix_privilege_tables.sql
    1.38 06/01/31 23:28:50 andrey@lmy004. +1 -1
    sql_mode should be after on_completion and before comment

ChangeSet
  1.2113 06/01/31 20:10:32 marty@linux.site +2 -0
  Added  test case for creating index on disk stored table

  mysql-test/t/ndb_dd_ddl.test
    1.4 06/01/31 20:10:19 marty@linux.site +2 -0
    Added  test case for creating index on disk stored table

  mysql-test/r/ndb_dd_ddl.result
    1.3 06/01/31 20:10:19 marty@linux.site +1 -0
    Added  test case for creating index on disk stored table

ChangeSet
  1.2105.3.1 06/01/31 13:10:05 reggie@big_geek. +5 -0
  a few corrections necessary for the win32 folder rename

  win/configure.js
    1.2 06/01/31 13:09:53 reggie@big_geek. +1 -1
    this file should be called from the root so we need to use the path

  win/cmakefiles/sql
    1.2 06/01/31 13:09:52 reggie@big_geek. +2 -2
    use proper win folder for path

  win/cmakefiles/base
    1.2 06/01/31 13:09:51 reggie@big_geek. +1 -1
    changed win32 to win

  win/build-vs8.bat
    1.3 06/01/31 13:09:49 reggie@big_geek. +6 -1
    fixed call out to deploy.bat

  win/build-vs71.bat
    1.3 06/01/31 13:09:48 reggie@big_geek. +6 -1
    fixed call out to deploy.bat

ChangeSet
  1.2109.1.1 06/01/31 18:08:11 marty@linux.site +2 -0
  Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  linux.site:/home/marty/MySQL/mysql-5.1-new

ChangeSet
  1.2105.2.1 06/01/31 18:46:44 tomas@poseidon.ndb.mysql.com +4 -0
  Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/ha_ndbcluster.h
    1.114 06/01/31 18:08:06 marty@linux.site +0 -0
    Auto merged

  sql/sql_show.cc
    1.293.1.2 06/01/31 18:46:37 tomas@poseidon.ndb.mysql.com +11 -0
    Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/handler.h
    1.185 06/01/31 18:46:37 tomas@poseidon.ndb.mysql.com +2 -0
    Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/ha_ndbcluster.h
    1.111.1.1 06/01/31 18:46:37 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

  sql/ha_ndbcluster.cc
    1.250 06/01/31 18:08:06 marty@linux.site +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.244.1.4 06/01/31 18:46:36 tomas@poseidon.ndb.mysql.com +27 -0
    Bug #16466  	DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK

ChangeSet
  1.2110 06/01/31 18:31:37 mskold@mysql.com +4 -0
  Updated tests for WL#1892

  mysql-test/r/ndb_alter_table_stm.result
    1.2 06/01/31 18:31:19 mskold@mysql.com +1 -1
    Updated tests for WL#1892

  mysql-test/t/ndb_alter_table_stm.test
    1.2 06/01/31 18:29:45 mskold@mysql.com +1 -1
    Updated tests for WL#1892

  mysql-test/t/ndb_alter_table_row.test
    1.4 06/01/31 18:29:45 mskold@mysql.com +3 -0
    Updated tests for WL#1892

  mysql-test/r/ndb_alter_table_row.result
    1.4 06/01/31 18:29:45 mskold@mysql.com +2 -0
    Updated tests for WL#1892

ChangeSet
  1.2105.1.3 06/01/31 17:22:38 andrey@lmy004. +1 -0
  add the sql_mode to the enum with the fields
  post-push fix for bug#16407 (sql_mode discarded)
  WL#1034 (Internal CRON)

  sql/event.h
    1.17 06/01/31 17:22:28 andrey@lmy004. +1 -0
    add the sql_mode to the enum with the fields
    post-push fix for bug#16407 (sql_mode discarded)
    WL#1034 (Internal CRON)

ChangeSet
  1.2109 06/01/31 17:11:21 marty@linux.site +3 -0
  Enable WL#1892 for binlog, wrong signature

  sql/ha_ndbcluster_binlog.cc
    1.7 06/01/31 17:11:07 marty@linux.site +1 -0
    Enable WL#1892 for binlog, wrong signature

  sql/ha_ndbcluster.cc
    1.249 06/01/31 17:11:07 marty@linux.site +3 -2
    Enable WL#1892 for binlog, wrong signature

  sql/ha_ndbcluster.h
    1.113 06/01/31 17:11:06 marty@linux.site +3 -2
    Enable WL#1892 for binlog, wrong signature

ChangeSet
  1.2105.1.2 06/01/31 17:10:44 andrey@lmy004. +1 -0
  post-push fix

  scripts/mysql_fix_privilege_tables.sql
    1.37 06/01/31 17:10:34 andrey@lmy004. +1 -1
    fix to be event and ADD

ChangeSet
  1.2108 06/01/31 17:01:14 marty@linux.site +1 -0
  Enable WL#1892 for binlog

  sql/ha_ndbcluster.cc
    1.248 06/01/31 17:00:08 marty@linux.site +21 -8
    Enable WL#1892 for binlog

ChangeSet
  1.2102.2.1 06/01/31 16:01:27 andrey@lmy004. +4 -0
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
  WL#1034 (Internal CRON)

  scripts/mysql_fix_privilege_tables.sql
    1.36 06/01/31 16:01:14 andrey@lmy004. +64 -0
    partial fix for bug#16407 (sql_mode not regarded)
    add sql_mode to mysql.event

  scripts/mysql_create_system_tables.sh
    1.36 06/01/31 16:01:14 andrey@lmy004. +32 -0
    partial fix for bug#16407 (sql_mode not regarded)
    add sql_mode to mysql.event

  mysql-test/r/system_mysql_db.result
    1.37 06/01/31 16:01:14 andrey@lmy004. +1 -0
    partial fix for bug#16407 (sql_mode not regarded)
    add sql_mode to mysql.event

  mysql-test/lib/init_db.sql
    1.23 06/01/31 16:01:13 andrey@lmy004. +32 -0
    partial fix for bug#16407 (sql_mode not regarded)
    add sql_mode to mysql.event

ChangeSet
  1.2107 06/01/31 15:53:35 marty@linux.site +1 -0
  Post review fixes

  sql/sql_table.cc
    1.301 06/01/31 15:53:23 marty@linux.site +4 -8
    Post review fixes

ChangeSet
  1.2106 06/01/31 15:47:00 marty@linux.site +1 -0
  Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  linux.site:/home/marty/MySQL/mysql-5.1-new

  sql/ha_ndbcluster.cc
    1.247 06/01/31 15:46:53 marty@linux.site +0 -0
    Auto merged

ChangeSet
  1.2105 06/01/31 08:03:25 reggie@big_geek. +2 -0
  change win32 to win

ChangeSet
  1.2098.4.1 06/01/31 15:40:26 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #16851  	Cluster: Auto Database Push is not working properly

  sql/ha_ndbcluster_binlog.h
    1.4 06/01/31 15:40:18 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #16851  	Cluster: Auto Database Push is not working properly

  sql/ha_ndbcluster_binlog.cc
    1.6 06/01/31 15:40:18 tomas@poseidon.ndb.mysql.com +39 -13
    Bug #16851  	Cluster: Auto Database Push is not working properly

  sql/ha_ndbcluster.cc
    1.244.1.3 06/01/31 15:40:18 tomas@poseidon.ndb.mysql.com +16 -48
    Bug #16851  	Cluster: Auto Database Push is not working properly

  win/build-vs8.bat
    1.2 06/01/31 08:03:19 reggie@big_geek. +3 -3
    change win32 to win

  win/build-vs71.bat
    1.2 06/01/31 08:03:18 reggie@big_geek. +3 -3
    change win32 to win

ChangeSet
  1.2103 06/01/31 07:52:16 reggie@big_geek. +23 -0
  initial cmake fileset.  It is not production ready but stable enough to start working with

  win/configure.js
    1.1 06/01/31 07:52:10 reggie@big_geek. +88 -0
    basic configure javascript

  win/configure.js
    1.0 06/01/31 07:52:10 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/configure.js

  win/config-version.js
    1.1 06/01/31 07:52:09 reggie@big_geek. +142 -0
    javascript file for updating mysql_version.h based on configure.in data

  win/config-version.js
    1.0 06/01/31 07:52:09 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/config-version.js

  win/config-handlerton.js
    1.1 06/01/31 07:52:08 reggie@big_geek. +171 -0
    javascript file for updating handlerton.cc based on configure options

  win/config-handlerton.js
    1.0 06/01/31 07:52:08 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/config-handlerton.js

  win/cmakefiles/zlib
    1.1 06/01/31 07:52:07 reggie@big_geek. +11 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/yassl
    1.1 06/01/31 07:52:07 reggie@big_geek. +6 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/zlib
    1.0 06/01/31 07:52:07 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/zlib

  win/cmakefiles/yassl
    1.0 06/01/31 07:52:07 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/yassl

  win/cmakefiles/vio
    1.1 06/01/31 07:52:06 reggie@big_geek. +9 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/vio
    1.0 06/01/31 07:52:06 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/vio

  win/cmakefiles/taocrypt
    1.1 06/01/31 07:52:05 reggie@big_geek. +9 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/taocrypt
    1.0 06/01/31 07:52:05 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/taocrypt

  win/cmakefiles/strings
    1.1 06/01/31 07:52:04 reggie@big_geek. +12 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/strings
    1.0 06/01/31 07:52:04 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/strings

  win/cmakefiles/sql
    1.1 06/01/31 07:52:03 reggie@big_geek. +118 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/sql
    1.0 06/01/31 07:52:03 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/sql

  win/cmakefiles/regex
    1.1 06/01/31 07:52:02 reggie@big_geek. +8 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/regex
    1.0 06/01/31 07:52:02 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/regex

  win/cmakefiles/mysys
    1.1 06/01/31 07:51:58 reggie@big_geek. +21 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/mysys
    1.0 06/01/31 07:51:58 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/mysys

  win/cmakefiles/myisammrg
    1.1 06/01/31 07:51:57 reggie@big_geek. +9 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/myisam
    1.1 06/01/31 07:51:56 reggie@big_geek. +14 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/myisammrg
    1.0 06/01/31 07:51:57 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/myisammrg

  win/cmakefiles/myisam
    1.0 06/01/31 07:51:56 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/myisam

  win/cmakefiles/innobase
    1.1 06/01/31 07:51:55 reggie@big_geek. +41 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/innobase
    1.0 06/01/31 07:51:55 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/innobase

  win/cmakefiles/heap
    1.1 06/01/31 07:51:54 reggie@big_geek. +8 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/heap
    1.0 06/01/31 07:51:54 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/heap

  win/cmakefiles/extra
    1.1 06/01/31 07:51:53 reggie@big_geek. +9 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/extra
    1.0 06/01/31 07:51:53 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/extra

  win/cmakefiles/deploy.bat
    1.1 06/01/31 07:51:52 reggie@big_geek. +19 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/dbug
    1.1 06/01/31 07:51:52 reggie@big_geek. +5 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/deploy.bat
    1.0 06/01/31 07:51:52 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/deploy.bat

  win/cmakefiles/dbug
    1.0 06/01/31 07:51:52 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/dbug

  win/cmakefiles/client
    1.1 06/01/31 07:51:51 reggie@big_geek. +45 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/client
    1.0 06/01/31 07:51:51 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/client

  win/cmakefiles/bdb
    1.1 06/01/31 07:51:50 reggie@big_geek. +8 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/bdb
    1.0 06/01/31 07:51:50 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/bdb

  win/cmakefiles/base
    1.1 06/01/31 07:51:49 reggie@big_geek. +13 -0
    cmakefile that will later be moved into the target directory

  win/cmakefiles/base
    1.0 06/01/31 07:51:49 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/cmakefiles/base

  win/build-vs8.bat
    1.1 06/01/31 07:51:48 reggie@big_geek. +6 -0
    batch file to build project files for Visual Studio 2005

  win/build-vs8.bat
    1.0 06/01/31 07:51:48 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/build-vs8.bat

  win/build-vs71.bat
    1.1 06/01/31 07:51:43 reggie@big_geek. +7 -0
    batch file to build project files for Visual Studio 2003

  win/build-vs71.bat
    1.0 06/01/31 07:51:43 reggie@big_geek. +0 -0
    BitKeeper file C:/Work/mysql/mysql-5.1/win/build-vs71.bat

ChangeSet
  1.2098.2.2 06/01/31 05:07:48 sasha@asksasha.com +2 -0
  post-merge fix

  mysql-test/r/mysqltest.result
    1.28 06/01/31 05:07:42 sasha@asksasha.com +1 -0
    post-merge fix

  client/mysqltest.c
    1.176 06/01/31 05:07:42 sasha@asksasha.com +21 -0
    post-merge fix

ChangeSet
  1.2098.3.1 06/01/31 11:42:36 jonas@perch.ndb.mysql.com +3 -0
  bug#10987 - rpl_ndb_bank
    last bug fix revealed another bug.
    fix buffer management when parsing table descriptor

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.17 06/01/31 11:42:33 jonas@perch.ndb.mysql.com +1 -1
    remove useless pages on backup record
      file buffer is good enough

  storage/ndb/src/kernel/blocks/backup/Backup.hpp
    1.16 06/01/31 11:42:33 jonas@perch.ndb.mysql.com +3 -4
    remove useless pages on backup record
      file buffer is good enough

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.35 06/01/31 11:42:33 jonas@perch.ndb.mysql.com +7 -41
    remove pages on backup record, use buffer in file record instead

ChangeSet
  1.2098.1.2 06/01/31 09:30:35 marty@linux.site +2 -0
  Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  linux.site:/home/marty/MySQL/mysql-5.1-new

  sql/sql_table.cc
    1.300 06/01/31 09:30:26 marty@linux.site +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.246 06/01/31 09:30:26 marty@linux.site +0 -0
    Auto merged

ChangeSet
  1.2098.2.1 06/01/30 20:58:17 sasha@asksasha.com +4 -0
  Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new

  mysql-test/t/mysqltest.test
    1.32 06/01/30 20:58:13 sasha@asksasha.com +1 -0
    merged

  mysql-test/r/mysqltest.result
    1.27 06/01/30 20:58:13 sasha@asksasha.com +0 -1
    merged

  client/mysqltest.c
    1.175 06/01/30 20:58:13 sasha@asksasha.com +0 -20
    merged

  BitKeeper/etc/ignore
    1.224 06/01/30 20:58:13 sasha@asksasha.com +1 -0
    Added BitKeeper/etc/RESYNC_TREE to the ignore list

ChangeSet
  1.2012.31.2 06/01/30 20:35:33 sasha@asksasha.com +3 -0
  #WL3026 - replace_regex in mysqltest 

  client/mysqltest.c
    1.165.1.3 06/01/30 20:35:27 sasha@asksasha.com +105 -20
    #WL3026 - replace_regex in mysqltest 

  mysql-test/t/mysqltest.test
    1.19.2.1 06/01/30 18:32:14 sasha@asksasha.com +26 -0
    #WL3026 - replace_regex in mysqltest 

  mysql-test/r/mysqltest.result
    1.15.1.3 06/01/30 18:32:14 sasha@asksasha.com +19 -0
    #WL3026 - replace_regex in mysqltest 

ChangeSet
  1.2098.1.1 06/01/31 01:37:48 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #16851, log floods with ndb discover messages
  + fix crashing bug when discovering ndb tables outside select context

  sql/ha_ndbcluster_binlog.h
    1.3 06/01/31 01:37:42 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #16851, log floods with ndb discover messages
    + fix crashing bug when discovering ndb tables outside select context

  sql/ha_ndbcluster_binlog.cc
    1.5 06/01/31 01:37:42 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #16851, log floods with ndb discover messages
    + fix crashing bug when discovering ndb tables outside select context

  sql/ha_ndbcluster.cc
    1.244.1.2 06/01/31 01:37:41 tomas@poseidon.ndb.mysql.com +23 -4
    Bug #16851, log floods with ndb discover messages
    + fix crashing bug when discovering ndb tables outside select context

ChangeSet
  1.2099 06/01/30 22:35:46 knielsen@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/x/mysql-5.1-new

  scripts/make_win_src_distribution.sh
    1.48 06/01/30 22:35:41 knielsen@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2089.5.1 06/01/30 21:07:01 jonas@perch.ndb.mysql.com +1 -0
  bug#10987 - rpl_ndb_bank -
    Allow GET_TABINFO during BACKUP
    (otherwise LCP gets corrupt)

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.73 06/01/30 21:06:57 jonas@perch.ndb.mysql.com +2 -1
    All GET_TABINFO during BACKUP

ChangeSet
  1.2095.1.3 06/01/30 17:57:20 knielsen@mysql.com +8 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes
  into  mysql.com:/usr/local/mysql/x/mysql-5.1-new

  VC++Files/client/mysqldump.vcproj
    1.3 06/01/30 17:56:58 knielsen@mysql.com +0 -27
    Manual merge.

  sql/sql_partition.cc
    1.29 06/01/30 17:54:12 knielsen@mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.198 06/01/30 17:54:12 knielsen@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.184 06/01/30 17:54:11 knielsen@mysql.com +0 -0
    Auto merged

  sql/event_timed.cc
    1.24 06/01/30 17:54:11 knielsen@mysql.com +0 -0
    Auto merged

  sql/event_executor.cc
    1.22 06/01/30 17:54:11 knielsen@mysql.com +0 -0
    Auto merged

  sql/event.h
    1.16 06/01/30 17:54:11 knielsen@mysql.com +0 -0
    Auto merged

  VC++Files/sql/mysqld.vcproj
    1.9 06/01/30 17:54:11 knielsen@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2089.3.2 06/01/30 17:12:30 andrey@lmy004. +4 -0
  post-merge fixes of fix for bug#16642 (No I_S.EVENTS table)
  WL#1034 (Internal CRON)

  sql/event_timed.cc
    1.23 06/01/30 17:11:42 andrey@lmy004. +2 -0
    add a bit more debug information

  mysql-test/t/events.test
    1.12 06/01/30 17:11:42 andrey@lmy004. +9 -9
    fix test, use --echo instead of select, fix failing create event statement

  mysql-test/r/system_mysql_db.result
    1.36 06/01/30 17:11:41 andrey@lmy004. +1 -1
    fix result(post-merge fix of bug #16642)

  mysql-test/r/events.result
    1.11 06/01/30 17:11:41 andrey@lmy004. +25 -106
    fix result of t/events (post-merge fix of bug #16642)

ChangeSet
  1.2096 06/01/30 07:40:06 reggie@linux.site +2 -0
  BUG# 14524 - Partitions: crash if blackhole
  This bug was fixed through other patches.  This test case just shows 
  that it is fixed.

ChangeSet
  1.2089.1.2 06/01/30 17:06:31 tomas@poseidon.ndb.mysql.com +5 -0
  added --core option in mysql-test-run for ndb

  mysql-test/t/ndb_restore.test
    1.14 06/01/30 17:06:24 tomas@poseidon.ndb.mysql.com +0 -3
    removed test printout not used

  mysql-test/r/ndb_restore.result
    1.9 06/01/30 17:06:24 tomas@poseidon.ndb.mysql.com +0 -8
    removed test printout not used

  mysql-test/ndb/ndbcluster.sh
    1.48 06/01/30 17:06:24 tomas@poseidon.ndb.mysql.com +8 -4
    added --core option in mysql-test-run for ndb

  mysql-test/mysql-test-run.sh
    1.293 06/01/30 17:06:24 tomas@poseidon.ndb.mysql.com +2 -2
    added --core option in mysql-test-run for ndb

  mysql-test/mysql-test-run.pl
    1.57.1.1 06/01/30 17:06:24 tomas@poseidon.ndb.mysql.com +8 -4
    added --core option in mysql-test-run for ndb

ChangeSet
  1.2071.33.1 06/01/30 15:16:49 mats@mysql.com +1 -0
  Fixing minor problem causing the rpl_row_basic_11bugs test to fail
  when executed using the Perl version of mysql-test-run.

  mysql-test/t/rpl_row_basic_11bugs-master.opt
    1.2 06/01/30 15:16:43 mats@mysql.com +1 -1
    Removing extreneous semicolon

ChangeSet
  1.2089.2.4 06/01/30 15:05:31 knielsen@mysql.com +6 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.0-merge
  into  mysql.com:/usr/local/mysql/mysql-5.1-merge

  VC++Files/sql/mysqld.vcproj
    1.7.1.1 06/01/30 15:05:27 knielsen@mysql.com +0 -0
    SCCS merged

  storage/innobase/os/os0file.c
    1.112 06/01/30 15:02:50 knielsen@mysql.com +0 -0
    Auto merged

  storage/innobase/include/os0file.h
    1.43 06/01/30 15:02:50 knielsen@mysql.com +0 -0
    Auto merged

  storage/innobase/os/os0file.c
    1.103.7.2 06/01/30 15:02:50 knielsen@mysql.com +0 -0
    Merge rename: innobase/os/os0file.c -> storage/innobase/os/os0file.c

  storage/innobase/include/os0file.h
    1.34.7.2 06/01/30 15:02:50 knielsen@mysql.com +0 -0
    Merge rename: innobase/include/os0file.h -> storage/innobase/include/os0file.h

  sql/ha_innodb.cc
    1.250.1.1 06/01/30 15:02:50 knielsen@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.124 06/01/30 15:02:50 knielsen@mysql.com +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.155 06/01/30 15:02:50 knielsen@mysql.com +0 -0
    Auto merged

  mysql-test/t/partition_hash.test
    1.3 06/01/30 07:39:59 reggie@linux.site +6 -0
    test block for bug# 14524

  mysql-test/r/partition_hash.result
    1.3 06/01/30 07:39:58 reggie@linux.site +3 -0
    result block for bug #14524

ChangeSet
  1.2089.3.1 06/01/30 14:28:48 andrey@lmy004. +15 -0
  post-commit merge

  mysql-test/t/events.test
    1.11 06/01/30 14:28:23 andrey@lmy004. +22 -20
    manual merge

  mysql-test/r/system_mysql_db.result
    1.35 06/01/30 14:28:23 andrey@lmy004. +0 -20
    manual merge

  mysql-test/r/events.result
    1.10 06/01/30 14:28:23 andrey@lmy004. +65 -0
    manual merge

ChangeSet
  1.2071.32.2 06/01/30 14:10:12 knielsen@mysql.com +1 -0
  Fix mysqlslap.vcproj dependencies also for Release and classic configuration.

  VC++Files/client/mysqlslap.vcproj
    1.4 06/01/30 14:09:45 knielsen@mysql.com +2 -2
    Fix dependencies also for Release and classic configuration.

  sql/sql_yacc.yy
    1.447 06/01/30 13:31:21 andrey@lmy004. +0 -0
    Auto merged

  sql/sql_parse.cc
    1.515 06/01/30 13:31:20 andrey@lmy004. +0 -0
    Auto merged

  sql/sql_lex.h
    1.214 06/01/30 13:31:18 andrey@lmy004. +0 -0
    Auto merged

  sql/mysqld.cc
    1.524.1.3 06/01/30 13:31:18 andrey@lmy004. +0 -0
    Auto merged

  sql/event_timed.cc
    1.22 06/01/30 13:31:17 andrey@lmy004. +0 -0
    Auto merged

  sql/event_priv.h
    1.15 06/01/30 13:31:17 andrey@lmy004. +0 -0
    Auto merged

  sql/event_executor.cc
    1.20.1.1 06/01/30 13:31:17 andrey@lmy004. +0 -0
    Auto merged

  sql/event.h
    1.14.1.1 06/01/30 13:31:16 andrey@lmy004. +0 -0
    Auto merged

  sql/event.cc
    1.23 06/01/30 13:31:16 andrey@lmy004. +0 -0
    Auto merged

  scripts/mysql_fix_privilege_tables.sql
    1.35 06/01/30 13:31:16 andrey@lmy004. +0 -0
    Auto merged

  scripts/mysql_create_system_tables.sh
    1.35 06/01/30 13:31:16 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/lib/init_db.sql
    1.22 06/01/30 13:31:15 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2089.2.3 06/01/30 16:28:51 svoj@april.(none) +1 -0
  Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new

  storage/myisam/ft_boolean_search.c
    1.99 06/01/30 16:28:42 svoj@april.(none) +0 -0
    Auto merged

ChangeSet
  1.2056.54.1 06/01/30 13:15:23 andrey@lmy004. +19 -0
  fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
  post-review change - use pointer instead of copy on the stack.
  WL#1034 (Internal CRON)
   This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
    EVENT_CATALOG  - MYSQL_TYPE_STRING  (Always NULL)
    EVENT_SCHEMA   - MYSQL_TYPE_STRING  (the database)
    EVENT_NAME     - MYSQL_TYPE_STRING  (the name)
    DEFINER        - MYSQL_TYPE_STRING  (user@host)
    EVENT_BODY     - MYSQL_TYPE_STRING  (the body from mysql.event)
    EVENT_TYPE     - MYSQL_TYPE_STRING  ("ONE TIME" | "RECURRING")
    EXECUTE_AT     - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
    INTERVAL_VALUE - MYSQL_TYPE_LONG    (set for RECURRING otherwise NULL)
    INTERVAL_FIELD - MYSQL_TYPE_STRING  (set for RECURRING otherwise NULL)
    SQL_MODE       - MYSQL_TYPE_STRING  (for now NULL)
    STARTS         - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
    ENDS           - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
    STATUS         - MYSQL_TYPE_STRING  (ENABLED | DISABLED)
    ON_COMPLETION  - MYSQL_TYPE_STRING  (NOT PRESERVE | PRESERVE)
    CREATED        - MYSQL_TYPE_TIMESTAMP
    LAST_ALTERED   - MYSQL_TYPE_TIMESTAMP
    LAST_EXECUTED  - MYSQL_TYPE_TIMESTAMP
    EVENT_COMMENT  - MYSQL_TYPE_STRING
  
    SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
  Support will be added as a fix for another bug.
  
   This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
  1. SHOW EVENTS shows always only the events on the same user,
     because the PK of mysql.event is (definer, db, name) several 
     users may have event with the same name -> no information disclosure.
  2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
     of all users. The user has to have PROCESS privilege, if not then
     SHOW FULL EVENTS behave like SHOW EVENTS.
  3. If [FROM db] is specified then this db is considered.
  4. Event names can be filtered with LIKE pattern.
    SHOW EVENTS returns table with the following columns, which are subset of
    the data which is returned by SELECT * FROM I_S.EVENTS
     Db
     Name
     Definer 
     Type
     Execute at
     Interval value
     Interval field 
     Starts 
     Ends
     Status

  sql/table.h
    1.126 06/01/30 13:15:05 andrey@lmy004. +1 -0
    add SCH_EVENTS as part of INFORMATION_SCHEMA

  sql/sql_yacc.yy
    1.438.1.3 06/01/30 13:15:05 andrey@lmy004. +25 -6
    - always call event_timed::init_definer() when CREATE/ALTER/DROP
      EVENT but not when just compiling the body of the event because
      in this case this operation is not needed, it takes memory and
      CPU time and at the end the result is not used. event_timed::definer
      is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
      statement compilation.
    - add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
      in case of FULL and the user has PROCESS privilege then he will see
      also others' events in the current database, otherwise the output
      is the same as of SHOW EVENTS. Because the events are per DB only
      the events from the current database are shown. pattern is applied
      against event name. FROM db is self explanatory.

  sql/sql_show.cc
    1.293.1.1 06/01/30 13:15:05 andrey@lmy004. +292 -0
    - add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
    - I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
      asked to be added so bug #16642 can be completely closed. There
      is another bug report which will fix the lack of storage of
      SQL_MODE during event creation.

  sql/sql_parse.cc
    1.510.2.1 06/01/30 13:15:04 andrey@lmy004. +6 -1
    - handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
    - make additional check in case of SHOW EVENTS (check for EVENT on
      the current database. if it is null check_access() gives appropriate
      message back.

  sql/sql_lex.h
    1.211.2.1 06/01/30 13:15:04 andrey@lmy004. +1 -1
    - register SHOW EVENTS as command

  sql/mysqld.cc
    1.519.3.1 06/01/30 13:15:04 andrey@lmy004. +1 -0
    - add counter for SHOW EVENTS

  sql/event_timed.cc
    1.17.3.1 06/01/30 13:15:04 andrey@lmy004. +19 -8
    - in event_timed::init_definer() always fill this.definer with
      the concatenated value of definer_user@definer_host. Makes
      later the work easier.
    - pass around the definer wherever is needed for searching 
      (new prototype of evex_db_find_evex_aux)

  sql/event_priv.h
    1.13.1.1 06/01/30 13:15:04 andrey@lmy004. +3 -24
    - moved enum evex_table_field and evex_open_event_table()
      to event.h (made them therefore public)

  sql/event_executor.cc
    1.18.2.1 06/01/30 13:15:03 andrey@lmy004. +3 -2
    - cosmetics

  sql/event.h
    1.13.1.1 06/01/30 13:15:03 andrey@lmy004. +29 -4
    - make enum evex_table_field again public so it can be used
    in sql_show.cc
    - make created and modified ulonglong, because they should be such
    - make public evex_open_event_table so it can be used in sql_show.cc

  sql/event.cc
    1.20.2.1 06/01/30 13:15:03 andrey@lmy004. +41 -22
    pass around the definer of the event because of the new PK
    which is (definer, db, name). It's needed for index searching.

  scripts/mysql_fix_privilege_tables.sql
    1.33.1.1 06/01/30 13:15:03 andrey@lmy004. +2 -0
    change the PK of mysql.event to (definer, db, name)

  scripts/mysql_create_system_tables.sh
    1.31.1.1 06/01/30 13:15:03 andrey@lmy004. +1 -1
    change the PK of mysql.event to (definer, db, name)

  mysql-test/t/events.test
    1.5.1.1 06/01/30 13:15:03 andrey@lmy004. +74 -0
    new tests for information_schema.events

  mysql-test/r/system_mysql_db.result
    1.33.1.1 06/01/30 13:15:03 andrey@lmy004. +20 -20
    result of new tests

  mysql-test/r/information_schema_db.result
    1.10 06/01/30 13:15:03 andrey@lmy004. +1 -0
    result of new tests

  mysql-test/r/information_schema.result
    1.104 06/01/30 13:15:03 andrey@lmy004. +11 -2
    result of new tests

  mysql-test/r/events.result
    1.4.1.1 06/01/30 13:15:03 andrey@lmy004. +96 -0
    result of new tests

  mysql-test/lib/init_db.sql
    1.20.1.1 06/01/30 13:15:03 andrey@lmy004. +1 -1
    change the PK - (definer, db, name)
    quicker searches when SHOW EVENTS;
    allow also different users to have events with the same name -> 
    no information disclosure

ChangeSet
  1.2071.32.1 06/01/30 13:09:08 knielsen@mysql.com +12 -0
  Windows compile fixes in preparation for 5.1.6 beta.

  sql/sql_partition.cc
    1.27.1.1 06/01/30 13:09:02 knielsen@mysql.com +4 -4
    Fix Windows byte * <-> char * mismatch.

  sql/set_var.cc
    1.162 06/01/30 13:09:02 knielsen@mysql.com +2 -2
    BUG#16811
    Fix Windows compilation by making the cast-away of volatile implicit
    (Windows linker does not like volatile <-> non-volatile mismatch, in
    contrast to Unix)

  sql/opt_range.cc
    1.196.1.1 06/01/30 13:09:02 knielsen@mysql.com +2 -2
    Fix Windows byte * <-> char * mismatch.

  sql/handler.h
    1.181.3.1 06/01/30 13:09:02 knielsen@mysql.com +1 -1
    Fix Windows byte * <-> char * mismatch.

  sql/ha_archive.cc
    1.76 06/01/30 13:09:02 knielsen@mysql.com +1 -1
    Add cast needed for Windows.

  sql/event_timed.cc
    1.19.2.1 06/01/30 13:09:02 knielsen@mysql.com +1 -1
    Fix type conflict only visible on Windows.

  sql/event_executor.cc
    1.21 06/01/30 13:09:02 knielsen@mysql.com +1 -1
    Fix non-portable thread stuff.

  sql/event.h
    1.15 06/01/30 13:09:02 knielsen@mysql.com +1 -1
    Fix type conflict only visible on Windows.

  scripts/make_win_src_distribution.sh
    1.46.1.1 06/01/30 13:09:01 knielsen@mysql.com +1 -1
    Add copying of missing directory.

  VC++Files/sql/mysqld.vcproj
    1.8 06/01/30 13:09:01 knielsen@mysql.com +462 -6
    Enable row-based replication.
    Add missing source files.

  VC++Files/mysql.sln
    1.13 06/01/30 13:09:01 knielsen@mysql.com +14 -14
    Fix configuration mismatch.

  VC++Files/client/mysqldump.vcproj
    1.1.1.1 06/01/30 13:09:01 knielsen@mysql.com +27 -0
    Add missing source file.

ChangeSet
  1.2089.2.2 06/01/30 12:42:27 knielsen@mysql.com +1 -0
  Fix another non-portable __attribute__

  plugin/fulltext/plugin_example.c
    1.6 06/01/30 12:42:13 knielsen@mysql.com +1 -2
    Fix another non-portable __attribute__

ChangeSet
  1.2089.2.1 06/01/30 11:25:47 serg@serg.mylan +1 -0
  __attribute__ is (of course) not portable

  plugin/fulltext/plugin_example.c
    1.5 06/01/30 11:25:35 serg@serg.mylan +1 -2
    __attribute__ is (of course) not portable

ChangeSet
  1.2071.31.1 06/01/30 11:09:55 tomas@poseidon.ndb.mysql.com +9 -0
  MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
    1.1 06/01/30 11:09:49 tomas@poseidon.ndb.mysql.com +65 -0
    New BitKeeper file ``storage/ndb/include/kernel/signaldata/AllocNodeId.hpp''

  storage/ndb/src/ndbapi/ndberror.c
    1.50 06/01/30 11:09:49 tomas@poseidon.ndb.mysql.com +10 -0
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
    1.40 06/01/30 11:09:49 tomas@poseidon.ndb.mysql.com +2 -1
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
    1.0 06/01/30 11:09:49 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql51/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
    1.89 06/01/30 11:09:48 tomas@poseidon.ndb.mysql.com +116 -0
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.26 06/01/30 11:09:48 tomas@poseidon.ndb.mysql.com +164 -0
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.8 06/01/30 11:09:48 tomas@poseidon.ndb.mysql.com +5 -0
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.10 06/01/30 11:09:48 tomas@poseidon.ndb.mysql.com +18 -0
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.29 06/01/30 11:09:48 tomas@poseidon.ndb.mysql.com +3 -0
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

  storage/ndb/include/kernel/GlobalSignalNumbers.h
    1.15 06/01/30 11:09:48 tomas@poseidon.ndb.mysql.com +3 -3
    MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's

ChangeSet
  1.2091 06/01/30 11:03:17 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15904/my51-bug15904
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

  sql/sql_table.cc
    1.299 06/01/30 11:03:11 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2071.30.1 06/01/30 10:57:42 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719
  into  neptunus.(none):/home/msvensson/mysql/bug15719/my51-bug15719

  tests/mysql_client_test.c
    1.169 06/01/30 10:57:34 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql-common/client.c
    1.83 06/01/30 10:57:34 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2087.1.1 06/01/30 08:23:54 jonas@perch.ndb.mysql.com +3 -0
  bug#10987 - ndb - ndb_rpl_bank
    more printouts...

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.27 06/01/30 08:23:52 jonas@perch.ndb.mysql.com +2 -1
    printouts

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.72 06/01/30 08:23:51 jonas@perch.ndb.mysql.com +11 -9
    printouts

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.34 06/01/30 08:23:51 jonas@perch.ndb.mysql.com +5 -0
    printouts

ChangeSet
  1.2088 06/01/30 02:24:47 petr@mysql.com +2 -0
  Do not create log table handler if run in bootstrap mode.
  This patch also fixes annoying complains on the log tables
  absence, issued by the shell version of mysql-test-run.

  sql/mysqld.cc
    1.524.1.2 06/01/30 02:24:44 petr@mysql.com +4 -1
    do not create log table handler, if run
    in bootstrap mode.

  sql/log.h
    1.2.1.2 06/01/30 02:24:44 petr@mysql.com +8 -2
    check for the table log handler presence, as now it
    could be absent in some cases. Namely, during bootstrap.

ChangeSet
  1.2087 06/01/29 23:13:39 jonas@perch.ndb.mysql.com +1 -0
  bug#10987 - ndb - ndb_rpl_bank
    even more debug printouts

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.88 06/01/29 23:13:36 jonas@perch.ndb.mysql.com +13 -1
    more printouts...

ChangeSet
  1.2086 06/01/29 15:53:34 jonas@perch.ndb.mysql.com +1 -0
  bug#10987 - ndb - more printouts to hunt rpl_ndb_bank problem in pushbuild

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.49 06/01/29 15:53:30 jonas@perch.ndb.mysql.com +5 -2
    more printouts
    write tabfile sync

ChangeSet
  1.2085 06/01/29 09:53:26 serg@serg.mylan +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into serg.mylan:/usr/home/serg/Abk/mysql-5.1

  sql/handler.h
    1.183 06/01/29 09:53:09 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.2071.29.1 06/01/28 16:22:32 patg@govinda.patg.net +7 -0
  WL# 2986
  
  Final patch
  -----------
  
  This WL is about using this bitmap in all parts of the partition handler.
  Thus for:
  rnd_init/rnd_next
  index_init/index_next and all other variants of index scans
  read_range_... the various range scans implemented in the partition handler.
  
  Also use those bitmaps in the various other calls that currently loop over all
  partitions.
  
  

  sql/sql_partition.cc
    1.28 06/01/28 16:22:28 patg@govinda.patg.net +2 -4
    WL# 2986
    
    Changed < to <=, which fixes the problem with edge cases going awry.

  sql/opt_range.cc
    1.197 06/01/28 16:22:28 patg@govinda.patg.net +15 -4
    WL# 2986
    
    Added bitmap_clear_all to clear bitmap prior to pruning
    DBUG code for testing

  sql/handler.h
    1.181.2.1 06/01/28 16:22:28 patg@govinda.patg.net +0 -1
    WL# 2986
    
    Removed unused member

  sql/ha_partition.h
    1.11 06/01/28 16:22:28 patg@govinda.patg.net +0 -1
    WL# 2986
    
    Removed unused member

  sql/ha_partition.cc
    1.25.1.1 06/01/28 16:22:28 patg@govinda.patg.net +191 -120
    WL# 2986
    
    Used work from 2682 and removed the partition select code.
        
    Added do {} while loop to any iteration over partitions to now utilise 
    m_part_info->used_partitions bitmap to determine if a partition should be
    used.

  mysql-test/t/partition_pruning.test
    1.6 06/01/28 16:22:28 patg@govinda.patg.net +132 -0
    WL# 2986
    
    New tests to show bitmap being used in ha_partition

  mysql-test/r/partition_pruning.result
    1.6 06/01/28 16:22:27 patg@govinda.patg.net +244 -38
    WL# 2986
    
    New results reflecting bitmap being used to determine if a partition is to be
    included

ChangeSet
  1.2071.25.4 06/01/28 19:21:40 serg@serg.mylan +3 -0
  two buffer overflows fixed

  sql/unireg.cc
    1.74 06/01/28 19:21:14 serg@serg.mylan +3 -3
    not too nice to do bzero(buf, 9) after char buf[5], eh ?

  sql/sql_parse.cc
    1.514 06/01/28 19:21:13 serg@serg.mylan +1 -0
    init thd->security_ctx->priv_host,
    otherwise - buffer overflow in db_create_routine

  sql/sp.cc
    1.101 06/01/28 19:21:12 serg@serg.mylan +1 -1
    use strxnmov, just in case

ChangeSet
  1.2083 06/01/28 10:37:22 joerg@debian.(none) +3 -0
  Merge

  sql/sql_table.cc
    1.297.2.1 06/01/28 10:37:15 joerg@debian.(none) +0 -0
    SCCS merged

  mysql-test/t/create.test
    1.75 06/01/28 10:30:25 joerg@debian.(none) +0 -0
    Auto merged

  mysql-test/r/create.result
    1.113 06/01/28 10:30:25 joerg@debian.(none) +0 -0
    Auto merged

ChangeSet
  1.2071.28.1 06/01/28 16:16:23 stewart@mysql.com +14 -0
  WL#1359 NDB: Add table handler and table information available from SQL commands
  
  add a FILES table that allows the user to run SQL queries on the files used
  to store their tables.
  
  Currently supports NDB

  storage/csv/ha_tina.cc
    1.33 06/01/28 16:16:19 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/sql_show.cc
    1.294 06/01/28 16:16:19 stewart@mysql.com +77 -4
    implement the INFORMATION_SCHEMA.FILES table.
    
    Eventually this may move to PERFORMANCE_SCHEMA.
    
    It currently exists to allow users to query disk usage for NDB disk data tables.
    

  sql/mysql_priv.h
    1.375 06/01/28 16:16:19 stewart@mysql.com +3 -0
    Add schema_table_store_record as a function that handlertons can call to store rows in INFORMATION_SCHEMA.FILES

  sql/log.cc
    1.188.2.1 06/01/28 16:16:19 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/handler.h
    1.181.1.1 06/01/28 16:16:19 stewart@mysql.com +3 -0
    Add fill_files_table to handlerton

  sql/ha_partition.cc
    1.26 06/01/28 16:16:19 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/ha_ndbcluster.cc
    1.244.2.1 06/01/28 16:16:19 stewart@mysql.com +160 -0
    Add fill_files_table and implementation for NDB disk data DATAFILES and UNDOFILES

  sql/ha_myisammrg.cc
    1.79 06/01/28 16:16:19 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/ha_myisam.cc
    1.171 06/01/28 16:16:18 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/ha_innodb.cc
    1.251 06/01/28 16:16:18 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/ha_heap.cc
    1.80 06/01/28 16:16:18 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/ha_federated.cc
    1.51 06/01/28 16:16:18 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/ha_blackhole.cc
    1.27 06/01/28 16:16:18 stewart@mysql.com +1 -0
    Add fill_files_table

  sql/ha_berkeley.cc
    1.169 06/01/28 16:16:18 stewart@mysql.com +1 -0
    Add fill_files_table

ChangeSet
  1.2071.26.1 06/01/27 20:27:10 pekka@mysql.com +2 -0
  ndb - wl#2972 fix null blobs

  sql/ha_ndbcluster.cc
    1.244.1.1 06/01/27 20:26:03 pekka@mysql.com +37 -14
    blobs: set_null is not enough, must also set empty buffer

  mysql-test/t/disabled.def
    1.51 06/01/27 20:26:03 pekka@mysql.com +1 -1
    blobs: set_null is not enough, must also set empty buffer

ChangeSet
  1.2071.1.16 06/01/27 17:23:14 marty@linux.site +4 -0
  Added possibillity to check what fields will get added indexes (ndb does currently not support indexes on disk stored fields), WL#1892

  sql/sql_table.cc
    1.297.1.1 06/01/27 17:22:59 marty@linux.site +18 -5
    Added possibillity to check what fields will get added indexes (ndb does currently not support indexes on disk stored fields), WL#1892

  sql/ha_ndbcluster.h
    1.112 06/01/27 17:22:59 marty@linux.site +1 -1
    Added possibillity to check what fields will get added indexes (ndb does currently not support indexes on disk stored fields), WL#1892

  sql/ha_ndbcluster.cc
    1.245 06/01/27 17:22:59 marty@linux.site +92 -36
    Added possibillity to check what fields will get added indexes (ndb does currently not support indexes on disk stored fields), WL#1892

  sql/field.h
    1.175 06/01/27 17:22:59 marty@linux.site +1 -0
    Added possibillity to check what fields will get added indexes (ndb does currently not support indexes on disk stored fields), WL#1892

ChangeSet
  1.2071.24.1 06/01/27 16:41:53 rburnett@production.mysql.com +2 -0
  BUG#15820 - Can create table with 1 partition, then doing ALTER .. ADD PARTITION crashes
  It is ok for a partitioned table to have only 1 partition.  This test is just to show that
  doing the ALTER TABLE ADD PARTITION doesn't crash the server.
  
  partition_mgm_err.result:
    Added result block for test of bug #15820
  partition_mgm_err.test:
    Added test block for bug #15820

  mysql-test/r/partition_mgm_err.result
    1.8 06/01/27 16:39:31 rburnett@production.mysql.com +2 -0
    Added result block for test of bug #15820

  mysql-test/t/partition_mgm_err.test
    1.8 06/01/27 16:39:14 rburnett@production.mysql.com +6 -0
    Added test block for bug #15820

ChangeSet
  1.2071.23.4 06/01/27 15:58:00 jonas@perch.ndb.mysql.com +2 -0
  ndb - fix compile error on sles9-x86

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.8 06/01/27 15:57:57 jonas@perch.ndb.mysql.com +12 -7
    Fix trick goto, getting compile error on some platforms

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.71 06/01/27 15:57:57 jonas@perch.ndb.mysql.com +11 -9
    Fix ref counts wrt alter table

ChangeSet
  1.2071.23.3 06/01/27 15:12:04 jonas@perch.ndb.mysql.com +1 -0
  bug#16842 - ndb dd - drop logfile group crashed after SR

  storage/ndb/src/kernel/blocks/lgman.cpp
    1.5 06/01/27 15:12:02 jonas@perch.ndb.mysql.com +1 -0
    Register thread start also on SR

ChangeSet
  1.2071.23.2 06/01/27 15:09:07 jonas@perch.ndb.mysql.com +1 -0
  bug#16495 - ndb dd - dict ref count was not correctly set after SR

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.70 06/01/27 15:09:04 jonas@perch.ndb.mysql.com +24 -8
    Add dump for object/ref count
    Fix ref count on SR

ChangeSet
  1.2071.23.1 06/01/27 14:23:43 jonas@perch.ndb.mysql.com +1 -0
  ndb dd - Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load

  storage/ndb/src/kernel/blocks/lgman.cpp
    1.4 06/01/27 14:23:40 jonas@perch.ndb.mysql.com +15 -6
    Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load

ChangeSet
  1.2071.22.1 06/01/27 16:10:40 petr@mysql.com +3 -0
  fix safemalloc warnings

  sql/mysqld.cc
    1.524.1.1 06/01/27 16:10:37 petr@mysql.com +4 -1
    split logger cleanup in two phases

  sql/log.h
    1.2.1.1 06/01/27 16:10:37 petr@mysql.com +4 -1
    split logging cleanup function in two

  sql/log.cc
    1.188.1.1 06/01/27 16:10:37 petr@mysql.com +12 -1
    split logging cleanup function in two
    and do actual delete of the log event
    handlers

ChangeSet
  1.2071.19.1 06/01/27 13:41:15 petr@mysql.com +5 -0
  Use one option --log-output[=option[,option...]]
  instead of current --old-log-format and
  --both-log-formats options

  sql/mysqld.cc
    1.525 06/01/27 13:41:11 petr@mysql.com +51 -41
    Use one option --log-output[=option[,option...]]
    instead of current --old-log-format and
    --both-log-formats options

  sql/log.h
    1.3 06/01/27 13:41:11 petr@mysql.com +10 -14
    Add log event handler flags to simplify log
    option processing

  sql/log.cc
    1.189 06/01/27 13:41:11 petr@mysql.com +38 -29
    use log event handler flags instead of enum_printer

  mysql-test/r/im_utils.result
    1.3 06/01/27 13:41:11 petr@mysql.com +2 -2
    correct result file

  mysql-test/mysql-test-run.pl
    1.58 06/01/27 13:41:11 petr@mysql.com +1 -1
    use new option instead of the old one for testing

ChangeSet
  1.2071.7.3 06/01/27 07:34:17 jonas@perch.ndb.mysql.com +3 -0
  ndb dd -
    fix bug in LCP + extent alloc

  storage/ndb/src/kernel/blocks/tsman.cpp
    1.5 06/01/27 07:34:14 jonas@perch.ndb.mysql.com +7 -4
    ifdef printouts

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.6 06/01/27 07:34:14 jonas@perch.ndb.mysql.com +50 -5
    Fix LCP in pgman with more than 32 pages in one bucket

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.7 06/01/27 07:34:14 jonas@perch.ndb.mysql.com +14 -10
    fix for page allocation

ChangeSet
  1.2071.1.9 06/01/27 01:07:34 andrey@lmy004. +3 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-bug16434

  sql/share/errmsg.txt
    1.77 06/01/27 01:07:29 andrey@lmy004. +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.446 06/01/27 01:07:28 andrey@lmy004. +0 -0
    Auto merged

  sql/event_timed.cc
    1.21 06/01/27 01:07:27 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2071.1.8 06/01/26 23:03:46 andrey@lmy004. +2 -0
  post-push fix of fix for bug #16401 (field should be char not varchar)
  WL#1034 (Internal CRON)

  mysql-test/r/system_mysql_db.result
    1.34 06/01/26 23:03:39 andrey@lmy004. +20 -20
    fix the result of the test after pull (currently system_mysql_db is disabled)

  mysql-test/lib/init_db.sql
    1.21 06/01/26 23:03:39 andrey@lmy004. +1 -1
    fix for bug #16401, varchar -> char

ChangeSet
  1.2071.15.2 06/01/26 22:18:40 andrey@lmy004. +2 -0
  post-commit fix of fix for bug#16419
  WL#1034 (Internal CRON)
  (not interesting for the Changelog)

  mysql-test/t/events.test
    1.10 06/01/26 22:18:32 andrey@lmy004. +1 -1
    update test after pull after comit of fix for bug 16419

  mysql-test/r/events.result
    1.9 06/01/26 22:18:32 andrey@lmy004. +1 -1
    update result

ChangeSet
  1.2071.17.1 06/01/26 22:10:12 andrey@lmy004. +3 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-bug16434

  sql/share/errmsg.txt
    1.75.1.1 06/01/26 22:10:04 andrey@lmy004. +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.444.1.1 06/01/26 22:10:03 andrey@lmy004. +0 -0
    Auto merged

  sql/event_timed.cc
    1.19.1.1 06/01/26 22:10:03 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2052.10.1 06/01/26 22:01:34 andrey@lmy004. +3 -0
  fix for bug#16434 (Events: Illegal dates don't cause errors)
  (post-review commit)
  WL#1034 (Internal CRON)

  sql/sql_yacc.yy
    1.436.2.1 06/01/26 22:01:24 andrey@lmy004. +19 -1
    handle error code returned by event_timed::init_starts()

  sql/share/errmsg.txt
    1.71.1.1 06/01/26 22:01:23 andrey@lmy004. +1 -1
    change error messages

  sql/event_timed.cc
    1.17.2.1 06/01/26 22:01:23 andrey@lmy004. +0 -3
    remove bogus check

ChangeSet
  1.2071.15.1 06/01/26 21:26:19 andrey@lmy004. +3 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-bug16419

  sql/sql_yacc.yy
    1.445 06/01/26 21:26:14 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/t/events.test
    1.9 06/01/26 21:26:11 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/r/events.result
    1.8 06/01/26 21:26:11 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2066.6.1 06/01/26 21:21:21 andrey@lmy004. +5 -0
  fix for bug#16419 (Events: can't use timestamp in the schedule)
  WL #1034 (Internal CRON)

  sql/sql_yacc.yy
    1.443.1.1 06/01/26 21:21:14 andrey@lmy004. +10 -0
    - handle new return value of event_timed::init_execute_at()

  sql/share/errmsg.txt
    1.76 06/01/26 21:21:14 andrey@lmy004. +1 -1
    - fix an error message, one more "einen"

  sql/event_timed.cc
    1.20 06/01/26 21:21:13 andrey@lmy004. +15 -7
    - remove stupid check of val_int()
    - fix for bug #16419 (Events: can't use timestamp in the schedule)
      => don't use val_int() but only get_date() and use the date!

  mysql-test/t/events.test
    1.7.1.1 06/01/26 21:21:13 andrey@lmy004. +9 -0
    add tests

  mysql-test/r/events.result
    1.6.1.1 06/01/26 21:21:13 andrey@lmy004. +9 -0
    update test result

ChangeSet
  1.2071.8.4 06/01/26 20:56:56 serg@serg.mylan +2 -0
  gcc295 fixes for embedded

  sql/handler.h
    1.182 06/01/26 20:56:42 serg@serg.mylan +11 -16
    gcc295 fixes for embedded

  libmysqld/lib_sql.cc
    1.110 06/01/26 20:56:42 serg@serg.mylan +3 -0
    gcc295 fixes for embedded

ChangeSet
  1.2071.1.6 06/01/26 20:30:12 andrey@lmy004. +1 -0
  fix for bug #16401  Events: mysql.event.comment is varchar(64)
  missed that one in the previos commit

  scripts/mysql_create_system_tables.sh
    1.34 06/01/26 20:30:05 andrey@lmy004. +1 -1
    fix for bug #16401  Events: mysql.event.comment is varchar(64)
    missed that one in the previos commit

ChangeSet
  1.2071.13.1 06/01/26 16:36:33 konstantin@mysql.com +4 -0
  Merge mysql.com:/opt/local/work/mysql-5.0-for-merge
  into  mysql.com:/opt/local/work/mysql-5.1-merge1

  sql/sql_select.cc
    1.383 06/01/26 16:36:23 konstantin@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.190 06/01/26 16:36:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/t/ps.test
    1.58 06/01/26 16:36:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps.result
    1.59 06/01/26 16:36:22 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2071.12.1 06/01/26 06:37:25 reggie@linux.site +1 -0
  using const char * as the output of strrchr to make solaris compiler happy.

  sql/ha_partition.cc
    1.25 06/01/26 06:37:19 reggie@linux.site +1 -1
    using const char * as the output of strrchr to make solaris compiler happy.

ChangeSet
  1.2056.53.1 06/01/26 15:23:53 SergeyV@selena. +2 -0
  Fixes a build problem of mysqlslap by adding a dependency to mysqlclient & mysys

  VC++Files/mysql.sln
    1.12 06/01/26 15:23:42 SergeyV@selena. +2 -0
    Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln

  VC++Files/client/mysqlslap.vcproj
    1.3 06/01/26 15:23:41 SergeyV@selena. +1 -1
    Explicit library specification removed from project file

ChangeSet
  1.2071.10.1 06/01/26 15:12:59 svoj@april.(none) +2 -0
  BUG#16722 - Fulltext: implicit limit for query word number (depends on length of the query)
  Remove implicit limit for query word number.

  storage/myisam/ft_boolean_search.c
    1.97.1.1 06/01/26 15:12:54 svoj@april.(none) +20 -13
    Remove implicit limit for query word number. Instead compute
    number of elements and allocate exactly needed memory.

  mysql-test/r/fulltext.result
    1.85 06/01/26 15:12:54 svoj@april.(none) +5 -5
    Reoder results.

ChangeSet
  1.2071.7.2 06/01/26 12:07:21 jonas@perch.ndb.mysql.com +4 -0
  bug#16787 - ndb dd - fix datafiles with more than 1 extent page

  storage/ndb/src/kernel/blocks/tsman.cpp
    1.4 06/01/26 12:07:19 jonas@perch.ndb.mysql.com +25 -3
    Fix creating of datafiles with more than 1 extent page

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.5 06/01/26 12:07:19 jonas@perch.ndb.mysql.com +8 -3
    Increase page entry pool
    Run LCP loop wo/ continueb

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
    1.24 06/01/26 12:07:19 jonas@perch.ndb.mysql.com +2 -2
    Increase extent pool

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.6 06/01/26 12:07:18 jonas@perch.ndb.mysql.com +7 -0
    qd fix for inconsistency tsman/tup

ChangeSet
  1.1810.1253.3 06/01/26 11:20:59 msvensson@neptunus.(none) +2 -0
  Bug #15719  MYSQL_OPT_RECONNECT option is modified by mysql_real_connect
   - Move init of "reconnect" variable to mysql_init 
   - Add test case to mysql_client_test.

  tests/mysql_client_test.c
    1.167.1.1 06/01/26 11:20:53 msvensson@neptunus.(none) +78 -2
    Add test to check that reconnect is not modified by a call to mysql_real_connect

  sql-common/client.c
    1.81.1.1 06/01/26 11:20:53 msvensson@neptunus.(none) +18 -17
    Move initialisation of reconnect variable to mysql_init instead of doing it in mysql_real_connect.

ChangeSet
  1.2071.9.1 06/01/26 11:14:20 tomas@poseidon.ndb.mysql.com +4 -0
   Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
    1.6 06/01/26 11:14:13 tomas@poseidon.ndb.mysql.com +0 -1
     Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
    1.16 06/01/26 11:14:13 tomas@poseidon.ndb.mysql.com +5 -14
     Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
    1.3 06/01/26 11:14:13 tomas@poseidon.ndb.mysql.com +4 -4
     Bug #16152, create event assertion in debug version, list corruption

  storage/ndb/include/kernel/signaldata/UtilExecute.hpp
    1.3 06/01/26 11:14:13 tomas@poseidon.ndb.mysql.com +2 -3
     Bug #16152, create event assertion in debug version, list corruption

ChangeSet
  1.2071.8.2 06/01/25 21:48:29 reggie@linux.site +2 -0
  fixed test issues with bug #14354.  I had mistakenly included
  /var/tmp in my path when testing data diretory.  the var directory
  exists in a src tree but may not exist in a different testing
  build setup.

ChangeSet
  1.2071.8.1 06/01/25 19:54:42 brian@zim.tangent.org +11 -0
  Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
  my_stat() gettinng the correct parameter list may be next :)

  storage/myisam/ft_stopwords.c
    1.24 06/01/25 19:54:37 brian@zim.tangent.org +1 -1
    replace

  sql/set_var.h
    1.79 06/01/25 19:54:37 brian@zim.tangent.org +1 -1
    replace

  sql/set_var.cc
    1.161 06/01/25 19:54:37 brian@zim.tangent.org +1 -1
    replace

  sql/log_event.cc
    1.201 06/01/25 19:54:37 brian@zim.tangent.org +2 -2
    replace

  sql/ha_federated.cc
    1.50 06/01/25 19:54:37 brian@zim.tangent.org +1 -1
    replace

  mysys/safemalloc.c
    1.25 06/01/25 19:54:37 brian@zim.tangent.org +1 -1
    replace

  mysys/my_malloc.c
    1.10 06/01/25 19:54:37 brian@zim.tangent.org +1 -1
    replace

  mysys/mf_tempdir.c
    1.6 06/01/25 19:54:37 brian@zim.tangent.org +1 -1
    replace

  include/my_sys.h
    1.187 06/01/25 19:54:37 brian@zim.tangent.org +3 -3
    replace

  extra/comp_err.c
    1.24 06/01/25 19:54:37 brian@zim.tangent.org +3 -3
    rename

  client/mysqlslap.c
    1.19 06/01/25 19:54:36 brian@zim.tangent.org +2 -2
    rename 

  mysql-test/t/partition_mgm_err.test
    1.7 06/01/25 21:46:24 reggie@linux.site +8 -7
    removed the /var/tmp path elements since there is not guarantee that
    other build setups will include this path

  mysql-test/r/partition_mgm_err.result
    1.7 06/01/25 21:46:23 reggie@linux.site +2 -0
    added a row insert just to make sure the data and index files are made

ChangeSet
  1.2071.2.9 06/01/25 18:21:22 jimw@mysql.com +1 -0
  Add storage/example to make_win_src_distribution

  scripts/make_win_src_distribution.sh
    1.47 06/01/25 18:20:57 jimw@mysql.com +1 -1
    Add storage/example

ChangeSet
  1.2071.2.8 06/01/25 22:49:31 pekka@mysql.com +1 -0
  add myself to checkout:get (should be default for all)

  BitKeeper/etc/config
    1.25 06/01/25 22:48:02 pekka@mysql.com +1 -0
    why is this not default?

ChangeSet
  1.2071.2.7 06/01/25 22:39:00 pekka@mysql.com +1 -0
  Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/space/pekka/ndb/version/my51

  mysql-test/t/disabled.def
    1.50 06/01/25 22:38:42 pekka@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.39.5 06/01/25 22:22:50 pekka@mysql.com +9 -0
  ndb - wl#2972 rbr blobs: write blob data to binlog

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.43 06/01/25 22:00:28 pekka@mysql.com +3 -0
    rbr blobs: write data + dict cache workarounds

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.99 06/01/25 22:00:27 pekka@mysql.com +41 -5
    rbr blobs: write data + dict cache workarounds

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.47 06/01/25 22:00:27 pekka@mysql.com +6 -0
    rbr blobs: write data + dict cache workarounds

  storage/ndb/src/ndbapi/NdbBlob.cpp
    1.33 06/01/25 22:00:27 pekka@mysql.com +3 -3
    rbr blobs: write data + dict cache workarounds

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.64 06/01/25 22:00:27 pekka@mysql.com +2 -0
    rbr blobs: write data + dict cache workarounds

  sql/ha_ndbcluster_binlog.cc
    1.4 06/01/25 22:00:26 pekka@mysql.com +113 -29
    rbr blobs: write data + dict cache workarounds

  sql/ha_ndbcluster.h
    1.111 06/01/25 22:00:26 pekka@mysql.com +8 -0
    rbr blobs: write data + dict cache workarounds

  sql/ha_ndbcluster.cc
    1.244 06/01/25 22:00:25 pekka@mysql.com +67 -36
    rbr blobs: write data + dict cache workarounds

  mysql-test/t/disabled.def
    1.41.3.1 06/01/25 22:00:25 pekka@mysql.com +4 -0
    rbr blobs: write data + dict cache workarounds

ChangeSet
  1.2071.2.6 06/01/25 13:10:00 reggie@linux.site +7 -0
  Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  linux.site:/home/reggie/work/mysql-5.1-bug14354

  mysql-test/t/partition_mgm_err.test
    1.6 06/01/25 13:09:55 reggie@linux.site +0 -0
    SCCS merged

  sql/sql_partition.cc
    1.27 06/01/25 13:06:53 reggie@linux.site +0 -0
    Auto merged

  sql/sql_parse.cc
    1.513 06/01/25 13:06:53 reggie@linux.site +0 -0
    Auto merged

  sql/mysql_priv.h
    1.374 06/01/25 13:06:53 reggie@linux.site +0 -0
    Auto merged

  sql/ha_partition.h
    1.10 06/01/25 13:06:53 reggie@linux.site +0 -0
    Auto merged

  sql/ha_partition.cc
    1.24 06/01/25 13:06:53 reggie@linux.site +0 -0
    Auto merged

  mysql-test/r/partition_mgm_err.result
    1.6 06/01/25 13:06:52 reggie@linux.site +0 -1
    Auto merged

ChangeSet
  1.2071.7.1 06/01/25 11:02:19 jonas@perch.ndb.mysql.com +2 -0
  bug#10987 - ndb - unable to find restorable replica
    Add massive printout when failure detected

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.48 06/01/25 11:02:16 jonas@perch.ndb.mysql.com +79 -0
    Add dumping of replica info

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.13 06/01/25 11:02:16 jonas@perch.ndb.mysql.com +2 -0
    Add dumping of replica info

ChangeSet
  1.2071.2.3 06/01/25 09:47:56 jonas@perch.ndb.mysql.com +3 -0
  bug#16771 - ndb dd - fix leak of extents

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.4 06/01/25 09:47:53 jonas@perch.ndb.mysql.com +20 -0
    Add debug printouts

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.5 06/01/25 09:47:53 jonas@perch.ndb.mysql.com +155 -50
    Add debug printouts
    Fix leak of extents

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.35 06/01/25 09:47:53 jonas@perch.ndb.mysql.com +2 -1
    Add debug printouts

ChangeSet
  1.2071.3.6 06/01/25 06:01:54 sergefp@mysql.com +2 -0
  Compile failure fix for gcc 2.95x: Don't use unnamed union of unnamed 
  structs in PARTITION_ITERATOR

  sql/sql_partition.cc
    1.26 06/01/25 06:01:48 sergefp@mysql.com +18 -18
    Compile failure fix for gcc 2.95x: Don't use unnamed union of unnamed 
    structs in PARTITION_ITERATOR

  sql/handler.h
    1.181 06/01/25 06:01:48 sergefp@mysql.com +20 -14
    Compile failure fix for gcc 2.95x: Don't use unnamed union of unnamed 
    structs in PARTITION_ITERATOR

ChangeSet
  1.2071.1.2 06/01/24 17:46:13 msvensson@neptunus.(none) +1 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020

  sql/table.cc
    1.204 06/01/24 17:46:07 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2071.6.1 06/01/24 16:04:35 andrey@lmy004. +4 -0
  fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
  WL#1034 (Internal CRON)

  sql/sql_yacc.yy
    1.444 06/01/24 16:04:20 andrey@lmy004. +3 -7
    ENABLED -> ENABLE
    DISABLED -> DISABLE
    fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)

  sql/lex.h
    1.153 06/01/24 16:04:20 andrey@lmy004. +0 -2
    enabled/disabled were only for events, going back to enable/disable
    fix for bug#16404

  mysql-test/t/events.test
    1.8 06/01/24 16:04:20 andrey@lmy004. +3 -2
    change test for the fix of bug#16404

  mysql-test/r/events.result
    1.7 06/01/24 16:04:19 andrey@lmy004. +3 -2
    fix results file

ChangeSet
  1.2071.3.5 06/01/24 15:50:04 guilhem@mysql.com +1 -0
  excess space caused "../scripts/mysql_create_system_tables: line 46: : command not found"
  when I ran mysql-test-run

  scripts/mysql_create_system_tables.sh
    1.33 06/01/24 15:49:59 guilhem@mysql.com +1 -1
    excess space caused "../scripts/mysql_create_system_tables: line 46: : command not found"
    when I ran mysql-test-run

ChangeSet
  1.2066.1.4 06/01/24 15:37:56 guilhem@mysql.com +1 -0
  Fix for crash of "mysql-test-run --debug mysqldump": don't access dir->str if dir is null.

  sql/parse_file.cc
    1.21 06/01/24 15:37:51 guilhem@mysql.com +2 -1
    since recently, the "dir" parameter can be 0.

ChangeSet
  1.2071.4.1 06/01/24 17:33:39 bar@mysql.com +1 -0
  table.cc:
    Try to open an old 5.0 table name
    if encoded name doesn't exist.
    This makes SELECT working without having
    to rename tables with tricky characters
    in name into 5.1 format (simpliefies upgrade).

  sql/table.cc
    1.201.1.2 06/01/24 17:31:07 bar@mysql.com +26 -1
    Try to open an old 5.0 table name
    if encoded name doesn't exist.
    This makes SELECT working without having
    to rename tables with tricky characters
    in name into 5.1 format (simpliefies upgrade).

ChangeSet
  1.2071.3.2 06/01/24 15:34:02 sergefp@mysql.com +4 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push

  sql/sql_class.cc
    1.241 06/01/24 15:33:58 sergefp@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.524 06/01/24 15:33:58 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.104 06/01/24 15:33:57 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/binlog_row_ctype_cp932.result
    1.3 06/01/24 15:33:57 sergefp@mysql.com +0 -1
    Auto merged

ChangeSet
  1.2069.1.1 06/01/24 13:26:21 jmiller@mysql.com +2 -0
  disabled.def:
    Updated to remove ndb_dd_disk2memory
  ndb_dd_disk2memory.result:
    Updated results to match change to show create table for NDB tables. WL 2604

  mysql-test/t/disabled.def
    1.49 06/01/24 13:24:49 jmiller@mysql.com +1 -1
    Updated to remove ndb_dd_disk2memory

  mysql-test/r/ndb_dd_disk2memory.result
    1.2 06/01/24 13:24:18 jmiller@mysql.com +4 -4
    Updated results to match change to show create table for NDB tables. WL 2604

ChangeSet
  1.2071.2.2 06/01/24 11:41:58 jonas@perch.ndb.mysql.com +1 -0
  bug#16742 - ndb dd - round filesize upwards

  storage/ndb/src/kernel/blocks/tsman.cpp
    1.3 06/01/24 11:41:55 jonas@perch.ndb.mysql.com +6 -11
    Round filesize upwards

ChangeSet
  1.2071.2.1 06/01/24 10:47:04 jonas@perch.ndb.mysql.com +4 -0
  bug#16738 - ndb dd - out of diskspace
    fix typo + add error code to printable list

  storage/ndb/src/ndbapi/ndberror.c
    1.49 06/01/24 10:47:01 jonas@perch.ndb.mysql.com +3 -1
    Add error code to printable list

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.28 06/01/24 10:47:01 jonas@perch.ndb.mysql.com +1 -0
    Set correct error code

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.4 06/01/24 10:47:01 jonas@perch.ndb.mysql.com +1 -3
    err is already negative

  storage/ndb/include/kernel/signaldata/Extent.hpp
    1.2 06/01/24 10:47:01 jonas@perch.ndb.mysql.com +1 -1
    Set correct error code

ChangeSet
  1.2071.1.1 06/01/24 10:31:41 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
  into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020

  sql/table.cc
    1.203 06/01/24 10:31:28 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2055.1.1 06/01/23 23:20:23 reggie@linux.site +7 -0
  bug #14354 - data directory and index directory not working for partitions

  sql/sql_partition.cc
    1.18.4.1 06/01/23 23:20:15 reggie@linux.site +12 -4
    add_keyword_string was not writing keyword value with quotes

  sql/sql_parse.cc
    1.509.1.1 06/01/23 23:20:15 reggie@linux.site +2 -4
    moving append_file_to_dir to mysql_priv.h

  sql/mysql_priv.h
    1.366.1.1 06/01/23 23:20:14 reggie@linux.site +2 -0
    move append_file_to_dir to mysql_priv.h

  sql/ha_partition.h
    1.8.1.1 06/01/23 23:20:14 reggie@linux.site +4 -2
    added partition_name_with_path to set_up_table_before_create

  sql/ha_partition.cc
    1.20.1.1 06/01/23 23:20:14 reggie@linux.site +13 -3
    pass partition filename with pathname into 
    set_up_table_before_create.
    
    remove the path from the passed in value and then append the filename
    to the data_file_name or index_file_name if those values were
    specified.

  mysql-test/t/partition_mgm_err.test
    1.2.1.1 06/01/23 23:20:14 reggie@linux.site +16 -0
    test for bug #14354
    first make sure /tmp/bug14354 is not there, then make the dir
    create a partitioned table with the partition using
    /tmp/bug14354 as it's data dir
    we are disabling query logging since we are using $MYSQL_TEST_DIR
    and we are not certain where the tmp files will be created.

  mysql-test/r/partition_mgm_err.result
    1.2.1.1 06/01/23 23:20:14 reggie@linux.site +1 -0
    only the single drop table since we have disabled query logging for the create table

ChangeSet
  1.2066.5.1 06/01/24 01:12:23 jmiller@mysql.com +1 -0
  disabled.def:
    Updated with new bug number

  mysql-test/t/disabled.def
    1.48 06/01/24 01:12:10 jmiller@mysql.com +1 -1
    Updated with new bug number

ChangeSet
  1.2066.4.1 06/01/23 22:17:12 guilhem@mysql.com +2 -0
  Fix for the test failure of binlog_row_ctype_cp932. Note that since we pushed row-based replication,
  "make test" != "mysql-test-run && mysql-test-run --ps-protocol". "make test" is what should be used;
  had it been, the failure would have been noticed earlier. Putting back cxx flags I had by accident removed.
  Disclaimer: 5.1-new is in a sorry state: log_tables and some ndb* fail, mysqlslap test crashes randomly in a row-based replication assertion (sql_class.cc:2207). 

  mysql-test/r/binlog_row_ctype_cp932.result
    1.1.1.1 06/01/23 22:17:08 guilhem@mysql.com +1 -0
    result update (people should run "make test" now, it tests row-based replication too).

  BUILD/SETUP.sh
    1.53 06/01/23 22:17:07 guilhem@mysql.com +1 -1
    Putting back flags which I, by accident, removed during the push of row-based replication (I had removed
    them in my tree because they cause tens of wrong warnings with my gcc4.0.0, and committed that by accident).

ChangeSet
  1.2056.52.1 06/01/23 22:09:53 andrey@lmy004. +1 -0
  fix for bug #16401 Events: mysql.event.comment is varchar(64)

  scripts/mysql_fix_privilege_tables.sql
    1.34 06/01/23 22:09:39 andrey@lmy004. +1 -1
    varchar -> char
    fix for bug #16401

ChangeSet
  1.2066.1.2 06/01/23 18:25:19 jmiller@mysql.com +1 -0
  Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  mysql-test/t/disabled.def
    1.47 06/01/23 18:25:11 jmiller@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2065.1.1 06/01/23 18:24:12 jmiller@mysql.com +1 -0
  disabled.def:
    Disabled ndb_dd_disk2memory

  mysql-test/t/disabled.def
    1.45.1.1 06/01/23 18:23:52 jmiller@mysql.com +1 -1
    Disabled ndb_dd_disk2memory

ChangeSet
  1.2066.3.2 06/01/23 10:39:32 reggie@linux.site +2 -0
  BUG# 15523 - ALTER TABLE ... PARTITION BY does not work
  this was fixed by WL 2604

  mysql-test/t/partition_mgm_err.test
    1.5 06/01/23 10:39:26 reggie@linux.site +9 -0
    test block for bug #15523

  mysql-test/r/partition_mgm_err.result
    1.5 06/01/23 10:39:26 reggie@linux.site +13 -0
    result block for bug#15523

ChangeSet
  1.2066.3.1 06/01/23 09:44:13 reggie@linux.site +2 -0
  BUG# 16534: just a change to the test suite showing that it's fixed.
  This bug was fixed as part of the large WL 2604 push.

  mysql-test/t/partition_mgm_err.test
    1.4 06/01/23 09:44:06 reggie@linux.site +17 -0
    test block for bug# 16534

  mysql-test/r/partition_mgm_err.result
    1.4 06/01/23 09:44:06 reggie@linux.site +13 -0
    results block for bug #16534

ChangeSet
  1.2066.1.1 06/01/23 16:13:46 andrey@lmy004. +4 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-tt-copy-works

  sql/sql_yacc.yy
    1.443 06/01/23 16:13:38 andrey@lmy004. +0 -0
    Auto merged

  sql/event_timed.cc
    1.19 06/01/23 16:13:37 andrey@lmy004. +0 -0
    Auto merged

  sql/event_executor.cc
    1.20 06/01/23 16:13:37 andrey@lmy004. +0 -0
    Auto merged

  sql/event.cc
    1.22 06/01/23 16:13:37 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2056.51.1 06/01/23 08:42:32 reggie@linux.site +3 -0
  Bug# 16718 partitioning support status variable has incorrect name
  change status variable from have_partition_engine to have_partitioning.

  sql/set_var.cc
    1.160 06/01/23 08:42:26 reggie@linux.site +1 -1
    change status variable from have_partition_engine to have_partitioning.

  mysql-test/r/have_partition.require
    1.2 06/01/23 08:42:26 reggie@linux.site +1 -1
    updated to use new status variable

  mysql-test/include/have_partition.inc
    1.2 06/01/23 08:42:26 reggie@linux.site +1 -1
    updated to use new status variable

ChangeSet
  1.2067 06/01/23 17:28:37 petr@mysql.com +1 -0
  Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug

  mysql-test/t/log_tables.test
    1.3 06/01/23 17:28:33 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.50.1 06/01/23 17:27:16 petr@mysql.com +1 -0
  disable ps_protocol in log_tables test.
  The log content is obviously different in two modes,
  as Queries are translated into Prepare and Execute
  commands. Thus we should use test only in one mode
  to get the match with result.

  mysql-test/t/log_tables.test
    1.1.1.1 06/01/23 17:24:58 cps@outpost.site +2 -0
    disable ps-protocol in log_tables test

ChangeSet
  1.2066 06/01/23 15:02:42 andrey@lmy004. +1 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-bug16548

  mysql-test/t/disabled.def
    1.46 06/01/23 15:02:35 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2064 06/01/23 14:48:12 jmiller@mysql.com +1 -0
  Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  mysql-test/t/disabled.def
    1.45 06/01/23 14:48:03 jmiller@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2063 06/01/23 14:46:56 jmiller@mysql.com +1 -0
  disabled.def:
    updated

  mysql-test/t/disabled.def
    1.44 06/01/23 14:46:00 jmiller@mysql.com +1 -1
    updated

ChangeSet
  1.2056.48.1 06/01/23 14:15:35 jonas@perch.ndb.mysql.com +1 -0
  ndb - Fix strange SR problems
    uninit variable

  storage/ndb/include/kernel/signaldata/LqhFrag.hpp
    1.7 06/01/23 14:15:32 jonas@perch.ndb.mysql.com +1 -1
    Correct signal length

ChangeSet
  1.2062 06/01/23 14:07:58 jmiller@mysql.com +1 -0
  rpl_foreign_key.test:
    Added comments on 1022 per Lars request

  mysql-test/extra/rpl_tests/rpl_foreign_key.test
    1.4 06/01/23 14:07:41 jmiller@mysql.com +2 -0
    Added comments on 1022 per Lars request

ChangeSet
  1.2056.45.4 06/01/23 13:56:34 andrey@lmy004. +1 -0
  - disable events for now (again)

  mysql-test/t/disabled.def
    1.41.1.9 06/01/23 13:56:23 andrey@lmy004. +1 -0
    - disable events for now (again)

ChangeSet
  1.2056.47.1 06/01/23 13:28:42 msvensson@neptunus.(none) +1 -0
  Bug#15904  	--tmpdir requires trailing slash '/'
   - Use same code for creating the temptable filename both from "mysql_create_table" and "mysql_create_like_table"

  sql/sql_table.cc
    1.298 06/01/23 13:28:37 msvensson@neptunus.(none) +10 -15
    Move common functionality to crate a temptable name 
    into "build_tmptable_filename", call it both from 
    "mysql_create_table" and "mysql_create_like_table"  

ChangeSet
  1.2056.46.2 06/01/23 13:07:31 andrey@lmy004. +5 -0
  Merge

  scripts/mysql_create_system_tables.sh
    1.32 06/01/23 13:07:27 andrey@lmy004. +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.441.1.1 06/01/23 13:02:39 andrey@lmy004. +0 -0
    Auto merged

  sql/share/errmsg.txt
    1.75 06/01/23 13:02:39 andrey@lmy004. +0 -0
    Auto merged

  sql/mysql_priv.h
    1.373 06/01/23 13:02:38 andrey@lmy004. +0 -0
    Auto merged

  sql/event.h
    1.14 06/01/23 13:02:38 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2056.46.1 06/01/23 15:31:54 holyfoot@mysql.com +2 -0
  Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb

  mysql-test/mysql-test-run.sh
    1.292 06/01/23 15:31:46 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.57 06/01/23 15:31:46 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.45.2 06/01/23 11:06:12 andrey@lmy004. +2 -0
  Merge

  mysql-test/t/disabled.def
    1.41.1.8 06/01/23 11:06:11 andrey@lmy004. +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.442 06/01/23 11:00:33 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2056.43.1 06/01/23 10:42:02 tomas@poseidon.ndb.mysql.com +3 -0
  added option for relative pat in ndb config
  added option for verbose ndb startup

  mysql-test/ndb/ndbcluster.sh
    1.47 06/01/23 10:41:55 tomas@poseidon.ndb.mysql.com +10 -1
    added option for relative pat in ndb config

  mysql-test/mysql-test-run.sh
    1.290.1.1 06/01/23 10:41:55 tomas@poseidon.ndb.mysql.com +11 -4
    added option for relative pat in ndb config
    added option for verbose ndb startup

  mysql-test/mysql-test-run.pl
    1.55.1.1 06/01/23 10:41:55 tomas@poseidon.ndb.mysql.com +4 -2
    added option for relative pat in ndb config

ChangeSet
  1.2056.34.7 06/01/23 09:57:04 jonas@perch.ndb.mysql.com +1 -0
  ndb - fix typo

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.69 06/01/23 09:57:01 jonas@perch.ndb.mysql.com +1 -1
    fix typo

ChangeSet
  1.2056.42.2 06/01/23 09:31:03 jonas@perch.ndb.mysql.com +1 -0
  bug#13556 - (ndb) - incorrect parsing in tablespace code
    end_ptr to my_strtoll10 is in/out parameter

  sql/sql_yacc.yy
    1.441 06/01/23 09:31:00 jonas@perch.ndb.mysql.com +1 -1
    init end_ptr as it's an in/out parameter, not only out

ChangeSet
  1.2056.41.2 06/01/23 11:59:31 holyfoot@mysql.com +6 -0
  Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb

  sql/sql_parse.cc
    1.512 06/01/23 11:59:21 holyfoot@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.283 06/01/23 11:59:21 holyfoot@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.239.1.1 06/01/23 11:59:21 holyfoot@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.522.1.1 06/01/23 11:59:21 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.291 06/01/23 11:59:20 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.56 06/01/23 11:59:20 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.18.5 06/01/23 11:58:14 holyfoot@deer.(none) +7 -0
  Fixes about the embedded-server in 5.1

  mysql-test/t/sp_notembedded.test
    1.2 06/01/23 11:58:08 holyfoot@mysql.com +2 -2
    test fixed

  mysql-test/t/log_tables.test
    1.2 06/01/23 11:58:08 holyfoot@mysql.com +2 -0
    test disabled in embedded server

  mysql-test/r/sp_notembedded.result
    1.2 06/01/23 11:58:08 holyfoot@mysql.com +171 -0
    result fixed

  mysql-test/r/mysqltest.result
    1.26 06/01/23 11:58:08 holyfoot@mysql.com +2 -2
    result fixed

  mysql-test/mysql-test-run.sh
    1.289.1.1 06/01/23 11:58:08 holyfoot@mysql.com +2 -0
    ndbcluster disabled in embedded server

  mysql-test/mysql-test-run.pl
    1.54.1.1 06/01/23 11:58:08 holyfoot@mysql.com +2 -0
    ndbcluster and ssl disabled in embedded server

  libmysqld/lib_sql.cc
    1.109 06/01/23 11:58:08 holyfoot@mysql.com +6 -0
    logger initialization added

ChangeSet
  1.2056.39.4 06/01/23 07:27:49 pekka@mysql.com +2 -0
  ndb - wl#2972 injector cleanup accessed blob event ops via Ndb => crash

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.13 06/01/23 07:24:45 pekka@mysql.com +2 -5
    hide blob event ops under main op

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.37 06/01/23 07:24:45 pekka@mysql.com +14 -9
    hide blob event ops under main op

ChangeSet
  1.2056.41.1 06/01/22 13:51:42 brian@zim.tangent.org +2 -0
  Small cleanups to remove old or un-needed methods.

  storage/csv/ha_tina.h
    1.13 06/01/22 13:51:35 brian@zim.tangent.org +0 -10
    Reomoved unneeded methods

  storage/csv/ha_tina.cc
    1.32 06/01/22 13:51:35 brian@zim.tangent.org +0 -91
    Removed unimplemented methods. 

ChangeSet
  1.2056.39.3 06/01/22 13:28:43 pekka@mysql.com +3 -0
  ndb - wl#2972 fix tinyblob

  storage/ndb/test/ndbapi/test_event_merge.cpp
    1.10 06/01/22 13:27:23 pekka@mysql.com +24 -8
    tinyblob of course has no blob table and no blob op

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.36 06/01/22 13:27:23 pekka@mysql.com +41 -35
    tinyblob of course has no blob table and no blob op

  storage/ndb/src/ndbapi/NdbBlob.cpp
    1.32 06/01/22 13:27:23 pekka@mysql.com +18 -14
    tinyblob of course has no blob table and no blob op

ChangeSet
  1.2056.39.2 06/01/22 10:37:57 pekka@mysql.com +1 -0
  ndb - wl#2972 injector saw blob table drop event => crash

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.35 06/01/22 10:33:25 pekka@mysql.com +12 -2
    catch non-data events on blob part tables

ChangeSet
  1.2056.39.1 06/01/21 11:57:15 pekka@mysql.com +1 -0
  Merge mysql.com:/space/pekka/ndb/version/my51
  into  mysql.com:/space/pekka/ndb/version/my51-rbr

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.34 06/01/21 11:56:55 pekka@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2061 06/01/20 23:39:13 jmiller@mysql.com +2 -0
  rpl_foreign_key_innodb.result, rpl_foreign_key.test:
    had to add order by

  mysql-test/r/rpl_foreign_key_innodb.result
    1.3 06/01/20 23:38:47 jmiller@mysql.com +5 -5
    had to add order by

  mysql-test/extra/rpl_tests/rpl_foreign_key.test
    1.3 06/01/20 23:38:11 jmiller@mysql.com +4 -4
    had to add order by

ChangeSet
  1.2060 06/01/20 23:28:52 jmiller@mysql.com +6 -0
  Updated test

  mysql-test/t/rpl_optimize.test
    1.6 06/01/20 23:28:05 jmiller@mysql.com +1 -3
    setting back to orginal values

ChangeSet
  1.2056.38.1 06/01/20 22:28:14 knielsen@mysql.com +1 -0
  Disable partitioning test on servers compiled without partitioning.

  mysql-test/include/partition_1.inc
    1.3 06/01/20 22:27:56 knielsen@mysql.com +2 -0
    Disable partitioning test on servers compiled without partitioning.

ChangeSet
  1.2052.9.2 06/01/20 22:24:58 andrey@lmy004. +5 -0
  fix for bug#16431 (Events: An event which alters itself disappears)
  WL#1034 (Internal CRON)

  sql/event_timed.cc
    1.17.1.1 06/01/20 22:24:51 andrey@lmy004. +17 -11
    - add ` around the names of the db and the event_name and not
    their concatenation. remove ; from the end - unneeded. this fixes bug #16431,
    which was failing because after some recursion the query was ending on ;;
    which is normally an error in the parser because that's the delimiter
    
    - more debug info
    - don't execute lex_end() two times when there's a parse error or thd->is_fatal_error

  sql/event_executor.cc
    1.18.1.1 06/01/20 22:24:51 andrey@lmy004. +6 -0
    be more verbose and throw more errors

  sql/event.cc
    1.20.1.1 06/01/20 22:24:51 andrey@lmy004. +12 -6
    - more debug info
    - pass info to evex_remove_from_cache() whether the operation 
      was drop or alter. this fixes possible bug that may lead to dropping
      of an event when it's altered. also fix for bug#16431

  mysql-test/t/events.test
    1.7 06/01/20 22:24:51 andrey@lmy004. +10 -0
    results of new tests

  mysql-test/r/events.result
    1.6 06/01/20 22:24:51 andrey@lmy004. +17 -0
    add a test for to test bug #16431

  mysql-test/r/rpl_foreign_key_innodb.result
    1.2 06/01/20 17:38:32 jmiller@mysql.com +2 -2
    Cleanup test for NDB

ChangeSet
  1.2056.37.1 06/01/20 18:12:45 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5

  mysql-test/t/rpl_foreign_key_innodb.test
    1.3 06/01/20 17:38:14 jmiller@mysql.com +0 -1
    Cleanup test for NDB

ChangeSet
  1.2056.36.1 06/01/20 16:26:34 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5

ChangeSet
  1.2056.35.2 06/01/20 16:25:42 sergefp@mysql.com +1 -0
  Update test result to include final DROP TABLE stmt

ChangeSet
  1.2056.35.1 06/01/20 19:38:11 sergefp@mysql.com +5 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5

  sql/sql_class.cc
    1.240 06/01/20 18:12:41 sergefp@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.523 06/01/20 16:26:30 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.213 06/01/20 19:38:06 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.236.1.3 06/01/20 19:38:06 sergefp@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.521.1.1 06/01/20 19:38:06 sergefp@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.189 06/01/20 19:38:06 sergefp@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.180 06/01/20 19:38:06 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/extra/rpl_tests/rpl_foreign_key.test
    1.2 06/01/20 17:38:04 jmiller@mysql.com +1 -1
    Cleanup test for NDB

ChangeSet
  1.2056.34.3 06/01/20 18:40:02 SergeyV@selena. +3 -0
  Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  selena.:H:/MYSQL/src/#00000-mysql-5.1

  VC++Files/mysql.sln
    1.11 06/01/20 18:39:55 SergeyV@selena. +0 -10
    manual merge

  configure.in
    1.333 06/01/20 18:36:57 SergeyV@selena. +0 -0
    Auto merged

  client/mysqlslap.c
    1.18 06/01/20 18:36:57 SergeyV@selena. +0 -0
    Auto merged

ChangeSet
  1.2052.5.3 06/01/20 18:20:03 SergeyV@selena. +1 -0
  Post review updates for win32 port of mysqlslap

  client/mysqlslap.c
    1.17 06/01/20 18:19:53 SergeyV@selena. +5 -5
    Post review updates for win32 port of mysqlslap

ChangeSet
  1.2052.9.1 06/01/20 16:12:44 andrey@lmy004. +4 -0
  fix for bug#16548 (Events: can't alter clause for preserve)
  WL #1034 (Internal CRON)

  sql/sql_yacc.yy
    1.436.1.1 06/01/20 16:12:32 andrey@lmy004. +24 -23
    - fix for bug#16548 (Events: can't alter clause for preserve)
    - prefix optional non-terminals with opt_

  mysql-test/t/events.test
    1.6 06/01/20 16:12:32 andrey@lmy004. +61 -56
    - comment out some tests (having problems now)
    - add test for fix for bug#16548

  mysql-test/t/disabled.def
    1.41.2.1 06/01/20 16:12:32 andrey@lmy004. +0 -1
    make it enabled

  mysql-test/r/events.result
    1.5 06/01/20 16:12:32 andrey@lmy004. +3 -65
    fix the results

ChangeSet
  1.2056.1.13 06/01/20 14:50:02 tomas@poseidon.ndb.mysql.com +3 -0
  option to run mysql-test-run without binlog
  calculate ndbcluster slave port

  sql/mysqld.cc
    1.522 06/01/20 14:49:52 tomas@poseidon.ndb.mysql.com +1 -1
    option to run mysql-test-run without binlog

  mysql-test/mysql-test-run.sh
    1.290 06/01/20 14:49:51 tomas@poseidon.ndb.mysql.com +8 -2
    option to run mysql-test-run without binlog

  mysql-test/mysql-test-run.pl
    1.55 06/01/20 14:49:51 tomas@poseidon.ndb.mysql.com +1 -0
    calculate ndbcluster slave port

  mysql-test/r/binlog_row_ctype_cp932.result
    1.2 06/01/20 16:25:39 sergefp@mysql.com +1 -0
    Update test result to include final DROP TABLE stmt

  BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a
    1.2 06/01/20 14:23:45 jmiller@mysql.com +0 -0
    Delete: mysql-test/r/not_ndb_table.require

  BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38
    1.3 06/01/20 14:23:27 jmiller@mysql.com +0 -0
    Delete: mysql-test/include/not_ndb_table.inc

ChangeSet
  1.2056.33.1 06/01/20 13:51:18 knielsen@mysql.com +1 -0
  Fix formatting.

  sql/log.cc
    1.188 06/01/20 13:50:49 knielsen@mysql.com +8 -4
    Fix formatting.

ChangeSet
  1.2056.31.2 06/01/20 13:24:18 knielsen@mysql.com +1 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/tmp5.1

  sql/sql_class.cc
    1.239 06/01/20 13:24:10 knielsen@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.31.1 06/01/20 13:23:24 knielsen@mysql.com +6 -0
  Portability compilation fixes.

  sql/sql_parse.cc
    1.510.1.1 06/01/20 13:22:34 knielsen@mysql.com +31 -16
    Fix HPUX compile failure, initializing char * with const char *

ChangeSet
  1.2056.24.4 06/01/20 13:17:55 knielsen@mysql.com +1 -0
  Back out errorneous Windows fix.

  sql/log_event.h
    1.128 06/01/20 13:17:10 knielsen@mysql.com +1 -3
    Back out errorneous Windows fix.

ChangeSet
  1.2056.30.1 06/01/20 12:55:07 tomas@poseidon.ndb.mysql.com +1 -0
  fix so that ndb builds --without-ndb-binlog

  sql/ha_ndbcluster_binlog.h
    1.2 06/01/20 12:54:56 tomas@poseidon.ndb.mysql.com +6 -8
    fix so that ndb builds --without-ndb-binlog

ChangeSet
  1.2056.5.4 06/01/20 12:54:34 serg@serg.mylan +1 -0
  make clean generated as appropriate

  sql/Makefile.am
    1.129 06/01/20 12:54:22 serg@serg.mylan +1 -1
    make clean generated as appropriate

  sql/table.cc
    1.201.1.1 06/01/20 12:33:53 knielsen@mysql.com +2 -2
    Rename macros to fix AIX conflict with system LOG_GENERAL macros.

  sql/sql_delete.cc
    1.172 06/01/20 12:33:53 knielsen@mysql.com +8 -8
    Rename macros to fix AIX conflict with system LOG_GENERAL macros.

  sql/mysql_priv.h
    1.372 06/01/20 12:33:53 knielsen@mysql.com +2 -2
    Rename macros to fix AIX conflict with system LOG_GENERAL macros.

  sql/log.cc
    1.187 06/01/20 12:33:53 knielsen@mysql.com +13 -13
    Rename macros to fix AIX conflict with system LOG_GENERAL macros.

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.32.1.1 06/01/20 11:28:21 knielsen@mysql.com +18 -18
    Fix sol10-amd64-a compile failure, conflict with system headers.

ChangeSet
  1.2056.29.1 06/01/20 11:05:02 jonas@perch.ndb.mysql.com +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1.4
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  storage/ndb/src/ndbapi/ndberror.c
    1.48 06/01/20 11:05:00 jonas@perch.ndb.mysql.com +0 -0
    merge

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.68 06/01/20 11:05:00 jonas@perch.ndb.mysql.com +11 -10
    merge

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h
    1.24 06/01/20 11:05:00 jonas@perch.ndb.mysql.com +1 -2
    merge

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.72 06/01/20 10:59:51 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.27.3 06/01/20 09:10:58 tomas@poseidon.ndb.mysql.com +1 -0
  Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.33 06/01/20 09:10:50 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.28.1 06/01/20 15:42:00 stewart@mysql.com +10 -0
  WL#2868 Fix backup trigger handling
  
  BACKUP previous set up triggers using DICT.
  This lead to all kind of trouble.
  An smaller alternative to using SUMA for backup
    is to just make BACKUP handle triggers to TUP directly.
  
  This way all triggers will be totally local,
    and error handling is much simpler.
  
  --- old impl.
  
  Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
  Master sends CREATE_TRIG_REQ for all tables to local DICT (dict master)
  Master sends START_BACKUP_REQ to all paricipants with trigger ids from DICT
  Master sends ALTER_TRIG_REQ (online) to local DICT
  Master waits for GCP
  Master starts distributed scan
  When scan has finished
  Master waits for GCP
  Master sends DROP_TRIGGER to local DICT
  Master sends STOP_BACKUP_REQ to all participants
  
  --- new impl.
  
  Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
  Master sends START_BACKUP_REQ to all paricipants
    Participand sends CREATE_TRIG_REQ for all tables to local TUP
  Master waits for GCP
  Master starts distributed scan
  When scan has finished
  Master waits for GCP
  Master sends STOP_BACKUP_REQ to all participants
    Participant sends DROP_TRIGGER to local TUP
  
  Changes:
  All trigger handling is _local_
   This implies, that abort (e.g due to node failure) can be _local_
  
  
  fix testBackup test so that it will run successfully with the (now correct)
  backup trigger code.

  storage/ndb/test/src/NdbBackup.cpp
    1.25 06/01/20 15:41:56 stewart@mysql.com +1 -1
    Update error insertions.

  storage/ndb/test/ndbapi/testBackup.cpp
    1.16 06/01/20 15:41:56 stewart@mysql.com +7 -6
    Don't do initial restart, just a restart. This is to avoid cache issues with
    schema versions

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.22 06/01/20 15:41:56 stewart@mysql.com +16 -3
    for SUBSCRIPTION triggers, make it so that the trigger ids are private to each block.

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.34 06/01/20 15:41:56 stewart@mysql.com +7 -1
    Add comment about meaning of triggerId
    Add sender BlockNumber parameter to dropTrigger.

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.16 06/01/20 15:41:56 stewart@mysql.com +0 -3
    remove ALTER_TRIG REF and CONF as we no longer use them.

  storage/ndb/src/kernel/blocks/backup/Backup.txt
    1.5 06/01/20 15:41:55 stewart@mysql.com +6 -9
    Update signals for new backup code.

  storage/ndb/src/kernel/blocks/backup/Backup.hpp
    1.15 06/01/20 15:41:55 stewart@mysql.com +14 -13
    - remove ALTER_TRIG (now unused)
    - add signalNo to BackupRecord
    - add SlaveData
    - remove dead items from MasterData
    - update prototype of startBackupReply

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.33 06/01/20 15:41:55 stewart@mysql.com +249 -393
    Use TUP triggers directly.
    
    removes ALTER trigger
    simplifies DROP triggers
    
    changes to node failure handling
    
    changes in signal order
    
    use SlaveData to track slave status.

  storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
    1.5 06/01/20 15:41:55 stewart@mysql.com +2 -10
    START_BACKUP_REQ no longer has tableIds and trigger ids

  storage/ndb/include/kernel/signaldata/BackupImpl.hpp
    1.7 06/01/20 15:41:55 stewart@mysql.com +4 -16
    rework START_BACKUP signals as we no longer need tableId and triggerIds.

ChangeSet
  1.2059 06/01/20 04:00:10 jmiller@mysql.com +2 -0
  Updated with feedback omer provided

  mysql-test/r/ndb_dd_ddl.result
    1.2 06/01/20 03:59:38 jmiller@mysql.com +19 -12
    Updated test case with suggestions from omer

  mysql-test/t/ndb_dd_ddl.test
    1.3 06/01/20 03:59:30 jmiller@mysql.com +41 -12
    Updated test case with suggestions from omer

ChangeSet
  1.2056.26.1 06/01/20 00:40:56 cps@outpost.site +15 -0
  Fix the tree: plugin-related changes, necessary for
  CSV storage engine to be statically compiled.
  Derived from antony's patch.

  storage/csv/ha_tina.h
    1.12 06/01/20 00:40:51 cps@outpost.site +4 -1
    fix prototype to get rid of THD

  storage/csv/ha_tina.cc
    1.31 06/01/20 00:40:51 cps@outpost.site +13 -16
    fix ha_tina to be able to build it static

  storage/csv/Makefile.am
    1.5 06/01/20 00:40:51 cps@outpost.site +6 -7
    compile CSV into a static lib to be
    linked into mysqld

  sql/sql_lex.h
    1.211.1.1 06/01/20 00:40:51 cps@outpost.site +6 -0
    Don't include all the types and files when not building mysqld

  sql/sql_class.h
    1.280.1.4 06/01/20 00:40:51 cps@outpost.site +5 -1
    Don't include all the types and files when not building mysqld

  sql/sql_class.cc
    1.236.1.2 06/01/20 00:40:51 cps@outpost.site +19 -0
    New plugin functions

  sql/mysql_priv.h
    1.371 06/01/20 00:40:51 cps@outpost.site +14 -0
    Don't include all the types and files when not building mysqld
    declare new plugin functions

  sql/lock.cc
    1.86 06/01/20 00:40:51 cps@outpost.site +5 -2
    don's assume that handler knows about THD

  sql/item.h
    1.186.1.2 06/01/20 00:40:51 cps@outpost.site +2 -1
    Don't include all the types and files when not building mysqld

  sql/handler.h
    1.174.1.9 06/01/20 00:40:51 cps@outpost.site +9 -1
    fix prototype to get rid of THD
    declare functions used by plugins

  sql/handler.cc
    1.213 06/01/20 00:40:51 cps@outpost.site +6 -0
    new function for plugins

  sql/ha_myisam.h
    1.72 06/01/20 00:40:51 cps@outpost.site +4 -1
    fix prototype to get rid of THD

  sql/ha_myisam.cc
    1.170 06/01/20 00:40:51 cps@outpost.site +4 -1
    fix prototype to get rid of THD

  configure.in
    1.331.1.2 06/01/20 00:40:51 cps@outpost.site +2 -2
    compile CSV statically

  config/ac-macros/storage.m4
    1.4 06/01/20 00:40:51 cps@outpost.site +4 -1
    don't add objects to the object list if
    we don't have them
     

ChangeSet
  1.2056.24.3 06/01/19 21:50:57 knielsen@mysql.com +2 -0
  Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/tmp5.1

  sql/sql_class.cc
    1.238 06/01/19 21:50:51 knielsen@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.200 06/01/19 21:50:51 knielsen@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.24.2 06/01/19 10:24:08 paul@snake-hub.snake.net +1 -0
  mysqlslap.c:
    Fix incorrect option description.

ChangeSet
  1.2056.23.1 06/01/19 13:32:58 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -0
  WL #2747: After push fixes

  storage/ndb/tools/restore/restore_main.cpp
    1.39 06/01/19 13:32:53 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +36 -39
    Removed debug printouts
    ndbout => info
    some ndbout => err
    and yet others
    ndbout => debug

  storage/ndb/tools/restore/consumer_restore.cpp
    1.25 06/01/19 13:32:53 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -12
    Removed debug printouts

  mysql-test/t/ndb_restore.test
    1.13 06/01/19 13:32:53 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -2
    Added new test cases and handling of error case for node group maps

  mysql-test/t/disabled.def
    1.41.1.7 06/01/19 13:32:52 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -1
    Activated ndb_restore again

  mysql-test/r/ndb_restore.result
    1.8 06/01/19 13:32:52 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -0
    Added check that no extra objects exist before starting
    Added printout from erronous node group map

  mysql-test/r/ndb_config.result
    1.8 06/01/19 13:32:52 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Upgraded DataMemory to 20M so that ndb_restore tests fit in memory

  mysql-test/ndb/ndbcluster.sh
    1.46 06/01/19 13:32:52 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Upgraded DataMemory to 20M so that ndb_restore tests fit in memory

  client/mysqlslap.c
    1.15.1.2 06/01/19 10:23:46 paul@snake-hub.snake.net +2 -1
    Fix incorrect option description.

ChangeSet
  1.2056.6.15 06/01/19 12:02:46 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
  into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020

ChangeSet
  1.2056.21.1 06/01/19 16:37:49 sergefp@mysql.com +3 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5

ChangeSet
  1.2056.18.4 06/01/19 13:29:10 holyfoot@mysql.com +12 -0
  Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb

ChangeSet
  1.2056.6.14 06/01/19 13:20:36 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/usr/home/bar/mysql-5.1-new.12448

ChangeSet
  1.2056.18.3 06/01/19 09:05:56 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  Added two test cases that needs fixing

  mysql-test/t/disabled.def
    1.41.1.6 06/01/19 09:05:52 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    Added two test cases that needs fixing

ChangeSet
  1.2056.18.2 06/01/19 08:58:32 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  Fixes for broken tree

  mysql-test/t/disabled.def
    1.41.1.5 06/01/19 08:58:28 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -2
    New definition of disabled test cases

  mysql-test/r/partition_02myisam.result
    1.2 06/01/19 08:58:28 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Added to test result

  sql/sql_partition.cc
    1.25 06/01/19 16:37:45 sergefp@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.519.1.2 06/01/19 16:37:44 sergefp@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.179 06/01/19 16:37:44 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1971.1.1 06/01/19 14:08:05 jonas@perch.ndb.mysql.com +5 -0
  bug#16455 - ndb crash when running of of rope pool

  storage/ndb/src/ndbapi/ndberror.c
    1.45.1.1 06/01/19 14:08:02 jonas@perch.ndb.mysql.com +2 -1
    New error code for rope pool

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.70.1.1 06/01/19 14:08:02 jonas@perch.ndb.mysql.com +12 -0
    New error code for rope pool

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.62.1.1 06/01/19 14:08:02 jonas@perch.ndb.mysql.com +36 -6
    New error code for rope pool

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h
    1.22.1.1 06/01/19 14:08:02 jonas@perch.ndb.mysql.com +2 -0
    New error code for rope pool

  storage/ndb/include/kernel/signaldata/CreateTable.hpp
    1.6 06/01/19 14:08:02 jonas@perch.ndb.mysql.com +2 -1
    New error code for rope pool

ChangeSet
  1.2056.19.1 06/01/19 14:01:32 pekka@mysql.com +13 -0
  ndb - wl#2972  rbr blobs ndb api support

  storage/ndb/test/ndbapi/test_event_merge.cpp
    1.9 06/01/19 14:00:03 pekka@mysql.com +77 -67
    rbr blobs ndb api support

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.12 06/01/19 14:00:03 pekka@mysql.com +37 -2
    rbr blobs ndb api support

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.33 06/01/19 14:00:03 pekka@mysql.com +429 -49
    rbr blobs ndb api support

  storage/ndb/src/ndbapi/NdbEventOperation.cpp
    1.10 06/01/19 14:00:03 pekka@mysql.com +12 -0
    rbr blobs ndb api support

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.42 06/01/19 14:00:03 pekka@mysql.com +4 -1
    rbr blobs ndb api support

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.98 06/01/19 14:00:03 pekka@mysql.com +82 -8
    rbr blobs ndb api support

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.46 06/01/19 14:00:03 pekka@mysql.com +5 -0
    rbr blobs ndb api support

  storage/ndb/src/ndbapi/NdbBlob.cpp
    1.31 06/01/19 14:00:03 pekka@mysql.com +227 -40
    rbr blobs ndb api support

  storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
    1.4 06/01/19 14:00:03 pekka@mysql.com +117 -52
    rbr blobs ndb api support

  storage/ndb/ndbapi-examples/ndbapi_event/Makefile
    1.3 06/01/19 14:00:03 pekka@mysql.com +3 -3
    rbr blobs ndb api support

  storage/ndb/include/ndbapi/NdbEventOperation.hpp
    1.18 06/01/19 14:00:03 pekka@mysql.com +8 -0
    rbr blobs ndb api support

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.63 06/01/19 14:00:03 pekka@mysql.com +19 -1
    rbr blobs ndb api support

  storage/ndb/include/ndbapi/NdbBlob.hpp
    1.18 06/01/19 14:00:03 pekka@mysql.com +37 -1
    rbr blobs ndb api support

  sql/table.cc
    1.202 06/01/19 12:02:39 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1945.49.1 06/01/19 11:43:19 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020
  into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020

  sql/table.cc
    1.192.3.1 06/01/19 11:43:15 msvensson@neptunus.(none) +2 -3
    Merge BUG#15020  from 5.0 -> 5.1

ChangeSet
  1.1810.1254.1 06/01/19 11:35:27 msvensson@neptunus.(none) +1 -0
  Bug#15020 "Can't find files" message incorrect for error 24

  sql/table.cc
    1.160.21.1 06/01/19 11:35:23 msvensson@neptunus.(none) +2 -1
    Use error message "Can't open file" if errno EMFILE is returned.

  sql/sql_prepare.cc
    1.159 06/01/19 13:29:00 holyfoot@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.511 06/01/19 13:29:00 holyfoot@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.282 06/01/19 13:29:00 holyfoot@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.236.3.1 06/01/19 13:29:00 holyfoot@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.519.2.2 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/t/view.test
    1.133 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.170 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqltest.test
    1.31 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysql_client_test.test
    1.16 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.27 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/r/view.result
    1.145 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.180 06/01/19 13:28:59 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2012.10.2 06/01/19 13:25:12 holyfoot@deer.(none) +15 -0
  Embedded-server related tests fixes

  mysql-test/r/subselect_notembedded.result
    1.1 06/01/19 13:25:06 holyfoot@mysql.com +1 -0

  mysql-test/r/subselect_notembedded.result
    1.0 06/01/19 13:25:06 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/subselect_notembedded.result

  mysql-test/r/sp_notembedded.result
    1.1 06/01/19 13:25:05 holyfoot@mysql.com +35 -0

  mysql-test/r/innodb_notembedded.result
    1.1 06/01/19 13:25:05 holyfoot@mysql.com +19 -0

  mysql-test/r/sp_notembedded.result
    1.0 06/01/19 13:25:05 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/sp_notembedded.result

  mysql-test/r/innodb_notembedded.result
    1.0 06/01/19 13:25:05 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/innodb_notembedded.result

  mysql-test/r/ctype_cp932_notembedded.result
    1.1 06/01/19 13:25:04 holyfoot@mysql.com +17 -0

  mysql-test/t/view_grant.test
    1.10 06/01/19 13:25:04 holyfoot@mysql.com +9 -0
    lines moved from view.test

  mysql-test/t/view.test
    1.132 06/01/19 13:25:04 holyfoot@mysql.com +0 -11
    lines moved to view_grant.test

  mysql-test/t/sp-destruct.test
    1.5 06/01/19 13:25:04 holyfoot@mysql.com +5 -0
    test disabled

  mysql-test/r/view_grant.result
    1.10 06/01/19 13:25:04 holyfoot@mysql.com +9 -0
    result fixed

  mysql-test/r/view.result
    1.142.1.1 06/01/19 13:25:04 holyfoot@mysql.com +0 -9
    result fixed

  mysql-test/r/sp.result
    1.177.1.1 06/01/19 13:25:04 holyfoot@mysql.com +0 -82
    result fixed

  mysql-test/r/sp-error.result
    1.99 06/01/19 13:25:04 holyfoot@mysql.com +0 -13
    result fixed

  mysql-test/r/query_cache_notembedded.result
    1.3 06/01/19 13:25:04 holyfoot@mysql.com +220 -0
    result fixed

  mysql-test/r/query_cache.result
    1.69 06/01/19 13:25:04 holyfoot@mysql.com +0 -45
    result fixed

  mysql-test/r/innodb.result
    1.154 06/01/19 13:25:04 holyfoot@mysql.com +0 -19
    result fixed

  mysql-test/r/ctype_cp932_notembedded.result
    1.0 06/01/19 13:25:04 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/ctype_cp932_notembedded.result

  sql/sql_yacc.yy
    1.440 06/01/19 13:20:27 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.6.13 06/01/19 10:58:49 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/usr/home/bar/mysql-5.1-new.12448

  sql/mysqld.cc
    1.521 06/01/19 10:58:39 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.17.1 06/01/19 05:56:06 cps@outpost.site +46 -0
  WL1019: complete patch. Reapplied patch to the clean
  tree to get rid of multiple typos in CS comments and
  unify the patch.

  mysql-test/t/log_tables.test
    1.1 06/01/19 05:56:01 cps@outpost.site +146 -0
    New BitKeeper file ``mysql-test/t/log_tables.test''

  mysql-test/r/log_tables.result
    1.1 06/01/19 05:56:01 cps@outpost.site +54 -0
    New BitKeeper file ``mysql-test/r/log_tables.result''

  storage/csv/ha_tina.h
    1.11 06/01/19 05:56:01 cps@outpost.site +21 -1
    enable concurrent insert for CSV, add log table flag

  storage/csv/ha_tina.cc
    1.30 06/01/19 05:56:01 cps@outpost.site +170 -6
    add support for concurrent insert (see bk commit - 5.1 tree
    (petr:1.1910) for standalone patch), add log tables-specific
    csv table handling.

  sql/table.h
    1.125 06/01/19 05:56:01 cps@outpost.site +6 -0
    add log-related info

  sql/table.cc
    1.201 06/01/19 05:56:01 cps@outpost.site +22 -9
    mark log tables as such during the open

  sql/sql_table.cc
    1.297 06/01/19 05:56:01 cps@outpost.site +4 -2
    don't reoped the log tables for admin purposes

  sql/sql_show.cc
    1.293 06/01/19 05:56:01 cps@outpost.site +3 -3
    convert old logging routines calls to use new API

  sql/sql_prepare.cc
    1.157.1.1 06/01/19 05:56:01 cps@outpost.site +3 -3
    convert old logging routines calls to use new API

  sql/sql_parse.cc
    1.510 06/01/19 05:56:01 cps@outpost.site +53 -41
    command_name is now an array of LEX_STRINGs

  sql/sql_delete.cc
    1.171 06/01/19 05:56:01 cps@outpost.site +36 -3
    fix TRUNCATE to work with log tables

  mysql-test/t/log_tables.test
    1.0 06/01/19 05:56:01 cps@outpost.site +0 -0
    BitKeeper file /home/cps/mysql/devel/mysql-5.1-logs-prepush/mysql-test/t/log_tables.test

  mysql-test/r/log_tables.result
    1.0 06/01/19 05:56:01 cps@outpost.site +0 -0
    BitKeeper file /home/cps/mysql/devel/mysql-5.1-logs-prepush/mysql-test/r/log_tables.result

  sql/sql_db.cc
    1.125 06/01/19 05:56:00 cps@outpost.site +2 -2
    convert old logging routines calls to use new API

  sql/sql_base.cc
    1.298 06/01/19 05:56:00 cps@outpost.site +27 -12
    TABLE objects used by the logger should be skipped
    during refreshes (as log tables are always opened
    and locked). fix table_is_used to skip them.  This
    is needed for FLUSH LOGS to work

  sql/slave.cc
    1.262 06/01/19 05:56:00 cps@outpost.site +2 -2
    convert old logging routines calls to use new API

  sql/share/errmsg.txt
    1.74 06/01/19 05:56:00 cps@outpost.site +4 -0
    add new error messages for the log tables

  sql/mysqld.cc
    1.519.2.1 06/01/19 05:56:00 cps@outpost.site +87 -34
    Add support for the log tables. Their initalization, cleanup
    and specific options.

  sql/mysql_priv.h
    1.370 06/01/19 05:56:00 cps@outpost.site +17 -3
    define common log routines and objects

  sql/log_event.cc
    1.198.1.1 06/01/19 05:56:00 cps@outpost.site +3 -2
    convert old logging routines calls to use new API

  sql/log.h
    1.2 06/01/19 05:56:00 cps@outpost.site +174 -4
    declare new log classes

  sql/log.cc
    1.186 06/01/19 05:56:00 cps@outpost.site +1084 -151
    Add log tables support, refactoring: there are log event
    handlers with common interface. They are used by the LOGGER
    class, which is responsible for their initialization, cleanup
    and managment. Logging to the tables provided by one of the
    log event handler types.

  sql/lock.cc
    1.85 06/01/19 05:56:00 cps@outpost.site +5 -11
    from now on we check for handler-related locking issues
    in the handler itself rather then in lock.cc

  sql/handler.h
    1.174.1.8 06/01/19 05:56:00 cps@outpost.site +24 -0
    new virtual function is added: we should check for handler-related
    locking issues in the handler

  sql/ha_myisam.h
    1.71 06/01/19 05:56:00 cps@outpost.site +1 -0
    new function declared

  sql/ha_myisam.cc
    1.169 06/01/19 05:56:00 cps@outpost.site +19 -0
    move locking-related checks to the hanlder

  scripts/mysql_fix_privilege_tables.sql
    1.33 06/01/19 05:56:00 cps@outpost.site +36 -0
    add new log tables: use an SP to create them for
    non-csv build to work fine.

  scripts/mysql_create_system_tables.sh
    1.31 06/01/19 05:56:00 cps@outpost.site +25 -0
    new system tables: slow_log and general_log

  mysql-test/t/system_mysql_db_fix.test
    1.21 06/01/19 05:56:00 cps@outpost.site +8 -1
    disable test if CSV engine is not in: result depends on the
    presence of CSV-based log tables

  mysql-test/t/system_mysql_db.test
    1.9 06/01/19 05:56:00 cps@outpost.site +4 -0
    disable test if CSV engine is not in: result depends on the
    presence of CSV-based log tables

  mysql-test/t/show_check.test
    1.61 06/01/19 05:56:00 cps@outpost.site +4 -0
    disable test if CSV engine is not in: result depends on the
    presence of CSV-based log tables

  mysql-test/t/mysqlcheck.test
    1.2 06/01/19 05:56:00 cps@outpost.site +4 -0
    disable test if CSV engine is not in: result depends on the
    presence of CSV-based log tables

  mysql-test/t/information_schema.test
    1.68 06/01/19 05:56:00 cps@outpost.site +4 -0
    disable test if CSV engine is not in: result depends on the
    presence of CSV-based log tables

  mysql-test/t/csv.test
    1.6 06/01/19 05:56:00 cps@outpost.site +35 -1
    add tests for concurrent insert (the functionality is added
    to CSV in this patch)

  mysql-test/t/connect.test
    1.20 06/01/19 05:55:59 cps@outpost.site +4 -0
    disable test if CSV engine is not in: result depends on the
    presence of CSV-based log tables

  mysql-test/r/system_mysql_db.result
    1.33 06/01/19 05:55:59 cps@outpost.site +27 -0
    update result

  mysql-test/r/show_check.result
    1.89 06/01/19 05:55:59 cps@outpost.site +18 -6
    update result

  mysql-test/r/mysqlcheck.result
    1.5 06/01/19 05:55:59 cps@outpost.site +8 -0
    update result

  mysql-test/r/information_schema.result
    1.103 06/01/19 05:55:59 cps@outpost.site +4 -2
    update result

  mysql-test/r/im_utils.result
    1.2 06/01/19 05:55:59 cps@outpost.site +2 -0
    update result

  mysql-test/r/csv.result
    1.5 06/01/19 05:55:59 cps@outpost.site +17 -0
    update result

  mysql-test/r/connect.result
    1.23 06/01/19 05:55:59 cps@outpost.site +6 -0
    update result

  mysql-test/mysql-test-run.pl
    1.54 06/01/19 05:55:59 cps@outpost.site +3 -0
    Add old logs flag to IM tests. As IM could only deal with
    old logs (this feature is not needed with log tables)

  mysql-test/lib/init_db.sql
    1.20 06/01/19 05:55:59 cps@outpost.site +4 -0
    create log tables when running tests.

  mysql-test/include/system_db_struct.inc
    1.7 06/01/19 05:55:59 cps@outpost.site +2 -0
    check log tables structure

  mysql-test/include/im_check_os.inc
    1.2 06/01/19 05:55:59 cps@outpost.site +7 -0
    we should only run im tests if csv is on for now: im relies
    on mysqld options available only in csv build.

  include/my_base.h
    1.81 06/01/19 05:55:59 cps@outpost.site +7 -2
    add new ha_extra flag for the log tables

  configure.in
    1.331.1.1 06/01/19 05:55:59 cps@outpost.site +2 -1
    CSV is compiled in by default now

ChangeSet
  1.2056.6.11 06/01/18 20:27:07 paul@snake-hub.snake.net +1 -0
  mysqlslap.c:
    Put options in standard order: --help first, then lexically.
    Rename --number-of-query to --number-of-queries.

  client/mysqlslap.c
    1.15.1.1 06/01/18 20:26:08 paul@snake-hub.snake.net +18 -18
    Put options in standard order: --help first, then lexically.
    Rename --number-of-query to --number-of-queries.

ChangeSet
  1.2056.16.2 06/01/18 16:18:42 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG #16596
  Moved init to lex_start

  sql/sql_yacc.yy
    1.438.1.2 06/01/18 16:18:37 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -1
    Removed init from CREATE INDEX code

  sql/sql_lex.cc
    1.170 06/01/18 16:18:37 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Added init to lex_start

ChangeSet
  1.2056.15.1 06/01/18 16:09:25 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  Bug fix

  sql/sql_yacc.yy
    1.438.1.1 06/01/18 16:09:20 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    initialised name that was missing

  sql/sql_partition.cc
    1.18.1.6 06/01/18 16:09:20 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -5
    Removed some dead code

  mysql-test/include/partition_1.inc
    1.2 06/01/18 16:09:20 pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Drop table missing in test case

ChangeSet
  1.2040.19.2 06/01/18 20:41:22 andrey@lmy004. +12 -0
  - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON)
  Before the interval expression was considered to be in seconds, now it is
  just a number and the type of interval is considered.
  
  - this changeset introduces also fix for bug#16432 (Events: error re interval
    misrepresents the facts)
    the code of event_timed::set_interval() was refactored anyway so it is meaningful to
    fix the bug in the same changeset.

  sql/time.cc
    1.59 06/01/18 20:41:06 andrey@lmy004. +108 -0
    extract the core of Item_date_add_interval::get_date()
    to a function per Serg's request. The code can be reused
    to add und substract interval from a date.

  sql/sql_yacc.yy
    1.435.1.1 06/01/18 20:41:05 andrey@lmy004. +1 -1
    - change error message to be appropriate as fix for bug#16432
      (Events: error re interval misrepresents the facts)

  sql/share/errmsg.txt
    1.70.1.1 06/01/18 20:41:04 andrey@lmy004. +2 -2
    - change error message to be appropriate as fix for bug#16432
      (Events: error re interval misrepresents the facts)

  sql/mysql_priv.h
    1.365.1.1 06/01/18 20:41:04 andrey@lmy004. +3 -0
    export the new function date_add_interval() added to time.cc

  sql/item_timefunc.h
    1.66 06/01/18 20:41:04 andrey@lmy004. +3 -14
    - export get_interval_value() so it can be reused in event_timed.cc in
      function static get_next_time()
    - move enum interval_type to include/my_time.h so it can be used by functions
      in the whole server

  sql/item_timefunc.cc
    1.102.1.1 06/01/18 20:41:04 andrey@lmy004. +4 -99
    - export get_interval_date()
    - refactor Item_date_add_interval::get_date() and extract the core
      to date_add_interval() in time.cc so it can be reused by the
      scheduler code in event_timed.cc

  sql/event_timed.cc
    1.18 06/01/18 20:41:03 andrey@lmy004. +174 -42
    - more docs
    - add static get_next_time() which sums a TIME with an interval
    - fix bug #16435 (Weekly events execute every second)
    Before the interval expression was considered to be in seconds, now it is
    just a number and the type of interval is considered.
    - fix for bug#16432 (Events: error re interval misrepresents the facts)
      (return an error if a value is too big or is negative - errmsg changed)

  sql/event_priv.h
    1.14 06/01/18 20:41:03 andrey@lmy004. +1 -0
    - define the maximal possible value for interval_value

  sql/event_executor.cc
    1.19 06/01/18 20:41:03 andrey@lmy004. +19 -4
    - pass thd to event_timed::compute_next_execution_time()
    - a bit more DBUG info in the server log
    - handle error returned by event_timed::compute_next_execution_time()

  sql/event.h
    1.11.1.2 06/01/18 20:41:03 andrey@lmy004. +2 -2
    pass thd to mark_last_executed() to be able to call thd->end_time()

  sql/event.cc
    1.21 06/01/18 20:41:03 andrey@lmy004. +15 -4
    - don't use second_part
    - fix small problem with create event xyz, when xyz exists -> make it error
      instead of warning if create_if_not is false.

  include/my_time.h
    1.12 06/01/18 20:41:03 andrey@lmy004. +15 -0
    - move enum interval_type to include/my_time.h so it can be used by functions
      in the whole server

ChangeSet
  1.2056.11.2 06/01/18 21:29:48 sergefp@mysql.com +2 -0
  WL#2985: Merge

  sql/sql_partition.cc
    1.24 06/01/18 21:15:14 sergefp@mysql.com +4 -2
    WL#2985: Merge

  sql/mysqld.cc
    1.519.1.1 06/01/18 21:15:14 sergefp@mysql.com +9 -8
    Fix compile warnings (as directed by Serg)

ChangeSet
  1.2056.12.2 06/01/18 16:45:17 tomas@poseidon.ndb.mysql.com +4 -0
  fixed startup suma bug when ndb api connects during node restart

  storage/ndb/src/kernel/blocks/suma/Suma.hpp
    1.10 06/01/18 16:45:10 tomas@poseidon.ndb.mysql.com +1 -0
    fixed startup suma bug when ndb api connects during node restart

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.31.1.1 06/01/18 16:45:10 tomas@poseidon.ndb.mysql.com +54 -3
    fixed startup suma bug when ndb api connects during node restart

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.28 06/01/18 16:45:10 tomas@poseidon.ndb.mysql.com +14 -0
    fixed startup suma bug when ndb api connects during node restart

  storage/ndb/include/kernel/signaldata/SystemError.hpp
    1.4 06/01/18 16:45:10 tomas@poseidon.ndb.mysql.com +3 -2
    fixed startup suma bug when ndb api connects during node restart

ChangeSet
  1.2056.13.1 06/01/18 19:27:10 holyfoot@deer.(none) +2 -0
  bug #15910 (Wrong value on error message)

  sql/share/errmsg.txt
    1.73 06/01/18 19:25:48 holyfoot@mysql.com +1 -1
    %ld to %s

  sql/ha_partition.cc
    1.23 06/01/18 19:25:48 holyfoot@mysql.com +4 -1
    using llstr to covert lonlong to string

ChangeSet
  1.2056.6.9 06/01/18 14:21:24 pekka@mysql.com +1 -0
  ndb - wl#2972 (5.1) omit trigger check post!=pre if recipient is SUMA

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.21 06/01/18 14:18:34 pekka@mysql.com +2 -1
    send identical post/pre data on update if recipient is SUMA (events, replication)

ChangeSet
  1.2056.12.1 06/01/18 12:44:08 mskold@mysql.com +4 -0
  Disabled fast/drop index temporarily

  sql/ha_ndbcluster.cc
    1.243 06/01/18 12:43:23 mskold@mysql.com +1 -0
    Disabled fast/drop index temporarily

  mysql-test/t/ndb_alter_table_row.test
    1.3 06/01/18 12:43:23 mskold@mysql.com +0 -2
    Disabled fast/drop index temporarily

  mysql-test/t/disabled.def
    1.41.1.4 06/01/18 12:43:23 mskold@mysql.com +0 -1
    Disabled fast/drop index temporarily

  mysql-test/r/ndb_alter_table_row.result
    1.3 06/01/18 12:43:23 mskold@mysql.com +0 -2
    Disabled fast/drop index temporarily

ChangeSet
  1.2056.11.1 06/01/18 14:09:08 sergefp@mysql.com +9 -0
  Manual merge

  sql/sql_partition.cc
    1.23 06/01/18 14:09:00 sergefp@mysql.com +0 -0
    Manual merge

  sql/opt_range.cc
    1.196 06/01/18 14:09:00 sergefp@mysql.com +0 -0
    Manual merge

  mysql-test/t/partition.test
    1.11 06/01/18 14:09:00 sergefp@mysql.com +0 -1
    Manual merge

  sql/sql_select.cc
    1.382 06/01/18 13:56:19 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.212 06/01/18 13:56:18 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.236.2.1 06/01/18 13:56:18 sergefp@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.188 06/01/18 13:56:18 sergefp@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.178 06/01/18 13:56:17 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/partition.result
    1.10 06/01/18 13:56:17 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2056.6.8 06/01/18 10:59:41 pekka@mysql.com +1 -0
  ndb - wl#2972 (5.1, related) un-initialized var in Suma

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.32 06/01/18 10:57:38 pekka@mysql.com +2 -0
    un-initialized m_reportAll caused event operation create / drop /create to get m_reportAll = true

ChangeSet
  1.2056.6.7 06/01/18 10:56:07 mskold@mysql.com +2 -0
  disabled.def:
    Disabled failing tests
  mysql_priv.h:
    Removed compiler warning

  mysql-test/t/disabled.def
    1.41.1.3 06/01/18 10:50:07 mskold@mysql.com +3 -0
    Disabled failing tests

ChangeSet
  1.2056.9.3 06/01/18 12:55:38 bar@mysql.com +8 -0
  loaddata.result, loaddata.test:
    Adding test case.
  sql_yacc.yy:
    Adding TEXT_STRING_filesystem, which
    converts from character_set_client to
    character_set_conversion.
    Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
    in LOAD DATA and SELECT INTO OUTFILE contexts.
  sql_class.h, sql_class.cc:
    Adding character_set_filesystem variable,
    and charset_is_character_set_filesystem
    flag (to avoid conversion when it's not necessary).
  set_var.h, set_var.cc:
    Adding sys_var_character_set_filesystem
  mysqld.cc:
    Adding --character-set-filesystem startup option.

  mysql-test/r/loaddata.result
    1.22 06/01/18 12:50:10 bar@mysql.com +27 -0
    Adding test case.

  mysql-test/t/loaddata.test
    1.16 06/01/18 12:49:58 bar@mysql.com +24 -0
    Adding test case.

  sql/sql_yacc.yy
    1.439 06/01/18 12:48:30 bar@mysql.com +16 -4
    Adding TEXT_STRING_filesystem, which
    converts from character_set_client to
    character_set_conversion.
    Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
    in LOAD DATA and SELECT INTO OUTFILE contexts.

  sql/sql_class.h
    1.280.1.3 06/01/18 12:47:54 bar@mysql.com +2 -0
    Adding character_set_filesystem variable,
    and charset_is_character_set_filesystem
    flag (to avoid conversion when it's not necessary).

  sql/sql_class.cc
    1.236.1.1 06/01/18 12:46:25 bar@mysql.com +3 -0
    Adding character_set_filesystem variable,
    and charset_is_character_set_filesystem
    flag (to avoid conversion when it's not necessary).

  sql/set_var.h
    1.78 06/01/18 12:46:19 bar@mysql.com +9 -0
    Adding sys_var_character_set_filesystem

  sql/set_var.cc
    1.159 06/01/18 12:45:55 bar@mysql.com +28 -0
    Adding sys_var_character_set_filesystem

  sql/mysqld.cc
    1.520 06/01/18 12:44:52 bar@mysql.com +16 -0
    Adding --character-set-filesystem startup option.

  sql/mysql_priv.h
    1.369 06/01/18 09:38:51 mskold@mysql.com +1 -1
    Removed compiler warning

ChangeSet
  1.2056.9.2 06/01/18 12:27:02 bar@mysql.com +4 -0
  sql_show.cc:
    Don't display charsets/collations with HIDDEN flag.
  ctype-utf8.c:
    Adding HIDDEN flag to "filename"
    Changeing ID to 17 which was previosly
    used by deprecated "win1251", removed in 4.1.
  charset-def.c:
    Adding "filename" as a hidden charset, for test purposes.
  m_ctype.h:
    Adding MY_CS_HIDDEN flag,
    to hide charsets and collations from
    being displayed in SHOW.

  sql/sql_show.cc
    1.292 06/01/18 12:24:35 bar@mysql.com +2 -0
    Don't display charsets/collations with HIDDEN flag.

  strings/ctype-utf8.c
    1.99 06/01/18 12:23:28 bar@mysql.com +2 -2
    Adding HIDDEN flag to "filename"
    Changeing ID to 17 which was previosly
    used by deprecated "win1251", removed in 4.1.

  mysys/charset-def.c
    1.16 06/01/18 12:23:02 bar@mysql.com +1 -0
    Adding "filename" as a hidden charset, for test purposes.

  include/m_ctype.h
    1.117 06/01/18 12:22:23 bar@mysql.com +2 -1
    Adding MY_CS_HIDDEN flag,
    to hide charsets and collations from
    being displayed in SHOW.

ChangeSet
  1.2058 06/01/18 00:45:23 jmiller@mysql.com +22 -0
  Updated test cases for testing Cluster Replication using the rpl* test cases

  mysql-test/t/rpl_timezone.test
    1.13 06/01/18 00:43:31 jmiller@mysql.com +19 -14
    Test clean up for CRBR testing

  mysql-test/r/rpl_timezone.result
    1.16 06/01/18 00:43:22 jmiller@mysql.com +13 -13
    Test clean up for CRBR testing

  mysql-test/r/rpl_user_variables.result
    1.17 06/01/18 00:23:27 jmiller@mysql.com +32 -32
    Test clean up for CRBR testing

  mysql-test/t/rpl_user_variables.test
    1.16 06/01/18 00:23:18 jmiller@mysql.com +9 -2
    Test clean up for CRBR testing

ChangeSet
  1.2056.9.1 06/01/17 21:38:19 knielsen@mysql.com +1 -0
  C++ comments in C files are not portable.

  mysys/my_compress.c
    1.13 06/01/17 21:23:49 knielsen@mysql.com +2 -2
    C++ comments in C files are not portable.

  mysql-test/r/rpl000005.result
    1.13 06/01/17 20:39:49 jmiller@mysql.com +2 -2
    updated test case

  mysql-test/t/rpl000005.test
    1.15 06/01/17 20:39:36 jmiller@mysql.com +7 -2
    updated test case

  mysql-test/t/rpl_optimize.test
    1.5 06/01/17 20:35:09 jmiller@mysql.com +7 -1
    Skip test when NDB is forced

  mysql-test/t/rpl_foreign_key_innodb.test
    1.2 06/01/17 20:25:17 jmiller@mysql.com +5 -0
    Skip test when NDB is forced

  mysql-test/include/not_ndb_table.inc
    1.2 06/01/17 20:07:56 jmiller@mysql.com +5 -0
    added comment header.

  mysql-test/r/rpl_loadfile.result
    1.2 06/01/17 19:44:50 jmiller@mysql.com +2 -9
    Updated test case

  mysql-test/t/rpl_loadfile.test
    1.2 06/01/17 19:44:38 jmiller@mysql.com +7 -7
    Updated test case

  mysql-test/r/rpl_loaddata2.result
    1.2 06/01/17 19:41:19 jmiller@mysql.com +20 -20
    Updated test case

  mysql-test/t/rpl_loaddata2.test
    1.2 06/01/17 19:40:47 jmiller@mysql.com +8 -2
    Updated test case

  mysql-test/r/rpl_000015.result
    1.36 06/01/17 19:37:54 jmiller@mysql.com +2 -2
    Updated test case

  mysql-test/t/rpl_000015.test
    1.33 06/01/17 19:37:43 jmiller@mysql.com +8 -2
    Updated test case

  mysql-test/r/not_ndb_table.require
    1.1 06/01/17 19:34:14 jmiller@mysql.com +2 -0
    Needed a way to tell some test case to skip running it default-storage-engine was set to ndb

  mysql-test/r/not_ndb_table.require
    1.0 06/01/17 19:34:14 jmiller@mysql.com +0 -0
    BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/not_ndb_table.require

  mysql-test/include/not_ndb_table.inc
    1.1 06/01/17 19:34:02 jmiller@mysql.com +5 -0
    Needed a way to tell some test case to skip running it default-storage-engine was set to ndb

  mysql-test/include/not_ndb_table.inc
    1.0 06/01/17 19:34:02 jmiller@mysql.com +0 -0
    BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/include/not_ndb_table.inc

ChangeSet
  1.2056.6.4 06/01/17 17:51:04 mskold@mysql.com +1 -0
  Post review fixes of WL#1892

ChangeSet
  1.2056.8.2 06/01/17 15:53:59 knielsen@mysql.com +1 -0
  Manual merge.

  sql/ha_ndbcluster.cc
    1.242 06/01/17 17:50:45 mskold@mysql.com +18 -19
    Post review fixes of WL#1892

  sql/sql_class.cc
    1.237 06/01/17 15:53:55 knielsen@mysql.com +0 -5
    Manual merge.

  mysql-test/t/rpl_log_pos.test
    1.36 06/01/17 13:14:35 jmiller@mysql.com +7 -1
    Changed test to allow ndbcluster engine to be use

  mysql-test/r/rpl_log_pos.result
    1.44 06/01/17 13:14:24 jmiller@mysql.com +1 -1
    Changed test to allow ndbcluster engine to be use

  mysql-test/r/rpl_bit.result
    1.2 06/01/17 13:08:53 jmiller@mysql.com +24 -24
    Changed test to allow ndbcluster engine to be use

  mysql-test/t/rpl_bit.test
    1.2 06/01/17 13:08:42 jmiller@mysql.com +10 -6
    Changed test to allow ndbcluster engine to be use

  mysql-test/r/rpl_row_USER.result
    1.2 06/01/17 12:59:04 jmiller@mysql.com +2 -2
    Changed test to allow ndbcluster engine to be use

  mysql-test/t/rpl_row_USER.test
    1.2 06/01/17 12:58:51 jmiller@mysql.com +6 -2
    Changed test to allow ndbcluster engine to be use

  BitKeeper/deleted/.del-ctype_cp932_notembedded.test~7c748e8e7ae6e7fe
    1.2 06/01/11 16:19:26 holyfoot@mysql.com +0 -0
    Delete: mysql-test/t/ctype_cp932_notembedded.test

