into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged

- the listed file_names are not necessarily on disk, so we need to discover them if they aren't


mysql-test/t/ndb_restore.test:
  Bug #30667 ndb table discovery does not work correcly with information schema

storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  AsyncFile: fsync on close only if file is open for write (for AIX)
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  AsyncFile: fsync on close only if file is open for write (for AIX)

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29674


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Sync changeset with 5.0

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Remove warning in pushbuild

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29674


mysql-test/Makefile.am:
  Sync 5.0 and 5.1

mysql-test/Makefile.am:
  Add install info of new test case data in makefile.am

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240

mysql-test/r/ndb_restore_compat.result:
  add "order by" to select clause
mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data:
  new data file
mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data:
  new data file
mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl:
  new ctl file
mysql-test/std_data/ndb_backup50/BACKUP-2.1.log:
  new log file
mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl:
  new ctl file
mysql-test/std_data/ndb_backup50/BACKUP-2.2.log:
  new log file
mysql-test/t/ndb_restore_compat.test:
  add "order by" to select clause

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30134


storage/ndb/tools/restore/Restore.cpp:
  Auto merged

BitKeeper/deleted/.del-ndb_restore_different_endian_data.result:
  Delete: mysql-test/r/ndb_restore_different_endian_data.result
BitKeeper/deleted/.del-BACKUP-1-0.1.Data:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
BitKeeper/deleted/.del-BACKUP-1-0.2.Data:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
BitKeeper/deleted/.del-BACKUP-1.1.ctl:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
BitKeeper/deleted/.del-BACKUP-1.1.log:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
BitKeeper/deleted/.del-BACKUP-1.2.ctl:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
BitKeeper/deleted/.del-BACKUP-1.2.log:
  Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
BitKeeper/deleted/.del-BACKUP-1-0.1.Data~a57077b1652462e:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
BitKeeper/deleted/.del-BACKUP-1-0.2.Data~7ded385bca6b1f64:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
BitKeeper/deleted/.del-BACKUP-1.1.ctl~f95f9b1922013c1f:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
BitKeeper/deleted/.del-BACKUP-1.1.log~a9759ef97cd15f92:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
BitKeeper/deleted/.del-BACKUP-1.2.ctl~3ebf846a47d4cc6c:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
BitKeeper/deleted/.del-BACKUP-1.2.log~6c37168b3738d195:
  Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
BitKeeper/deleted/.del-ndb_restore_different_endian_data.test:
  Delete: mysql-test/t/ndb_restore_different_endian_data.test

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29674


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Revert the change in parseTableInfo for modified only in 5.0
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Revert declare of pareTableInfo for 5.1
storage/ndb/tools/restore/Restore.cpp:
  Revert change in 5.1

Index: ndb-work/storage/ndb/tools/ndb_size.pl
===================================================================


storage/ndb/tools/ndb_size.pl:
  BUG#28253 ndb_size.pl: cannot set socket

Index: ndb-work/storage/ndb/tools/ndb_size.pl
===================================================================


storage/ndb/tools/ndb_size.pl:
  Bug#29228 ndb_size.pl borks on float columns with comma in ()

Patch by: Monty Taylor <mtaylor@mysql.com>
Fixes by: Stewart Smith

  Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
  ---
  Added schema name information to index table calculations as well.
  ---
  Made database an optional parameter, the exclusion of which causes all databases to be examined.
  If selecting from information_schema fails, attempt to fall back to show tables from
  ---
  Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
  ---
  Fixed report title for the case where we are using operating on more than one database.
  ---
  Fixed some perl style concerns timothy had.
  Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
  Get this full list of databases from show databases if needed.

  storage/ndb/tools/ndb_size.pl@stripped, 2007-05-25 13:45:44-07:00, mtaylor@qualinost.(none) +102 -28
    Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
    ---
    Added schema name information to index table calculations as well.
    ---
    Made database an optional parameter, the exclusion of which causes all databases to be examined.
    If selecting from information_schema fails, attempt to fall back to show tables from
    ---
    Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
    ---
    Fixed report title for the case where we are using operating on more than one database.
    ---
    Fixed some perl style concerns timothy had. 
    Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
    Get this full list of databases from show databases if needed.

Index: ndb-work/storage/ndb/tools/ndb_size.pl
===================================================================


storage/ndb/tools/ndb_size.pl:
  BUG#28683 - ndb_size.pl should support more than one database

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Regenerated result

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


mysql-test/r/ndb_bug26793.result:
  Auto merged
mysql-test/t/ndb_bug26793.test:
  Auto merged

ChangeSet@1.2575, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
  Bug#26793 mysqld crashes when doing specific query on information_schema
   - Drop the newly created user user1@localhost
   - Cleanup testcase


mysql-test/r/ndb_bug26793.result:
    mysql-test/r/ndb_bug26793.result@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none)
  +1 -6
      Update test result
mysql-test/t/ndb_bug26793.test:
    mysql-test/t/ndb_bug26793.test@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +8
  -11
      - Remove the drop/restore of anonymous users - there are no such users
      by default anymore(if there were, they would probably be in mysql.user)
      - Switch back to default connection before cleanup 
      - Drop user1@localhost as part of cleanup

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/t/ndb_read_multi_range.test:
  merge
sql/ha_ndbcluster.cc:
  merge

bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Disable multi_read_range if there are after delete/update triggers

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423


sql/ha_ndbcluster.cc:
  make HA_ERR_FOUND_DUPP_KEY error cases throw warning like the other ambiguous engine error codes that may be caused by multiple cluster error codes.

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug27683


storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Twiddle the "replicaCount" and "fragCount" variable when restore data from different endian.
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add byte order variable
ndb/tools/restore/Restore.cpp:
  Twiddle blob, datatime,timestamp when do restore in different endian.
mysql-test/r/ndb_restore_different_endian_data.result:
  Test case result for restore data from different endian
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log:
  Test case data
mysql-test/t/ndb_restore_different_endian_data.test:
  Test case for restore data from different endian

 - Drop the newly created user user1@localhost
 - Cleanup testcase


mysql-test/r/ndb_bug26793.result:
  Update test result
mysql-test/t/ndb_bug26793.test:
  - Remove the drop/restore of anonymous users - there are no such users
  by default anymore(if there were, they would probably be in mysql.user)
  - Switch back to default connection before cleanup 
  - Drop user1@localhost as part of cleanup

storage/ndb/tools/restore/Restore.cpp:
  Convert byte order of timestamp data type

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

This patch corrects a incorrect type conversion during encoding and
decoding the length for VARCHAR fields.


sql/log_event.cc:
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch changes the encoding of the 16-bit length value for
  VARCHAR field correcting an undetected type conflict.
sql/rpl_utility.h:
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch changes the decoding of the 16-bit length value for
  VARCHAR field correcting an undetected type conflict.

  
This patch changes the code to comply with different word order on Solaris

Patch for PB testing errors.


sql/rpl_utility.h:
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch corrects a problem detected on 64-bit platforms with BIT and
  VARCHAR fields.

Patch corrects minor test anomolies and build warnings.


mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  WL#3915 : (NDB) master's cols > slave
  
  Patch masks out the port number in the show slave status results.
mysql-test/r/rpl_extraColmaster_innodb.result:
  WL#3915 : (NDB) master's cols > slave
  
  New result file from changed test.
mysql-test/r/rpl_extraColmaster_myisam.result:
  WL#3915 : (NDB) master's cols > slave
  
  New result file from changed test.
mysql-test/r/rpl_row_extraColmaster_ndb.result:
  WL#3915 : (NDB) master's cols > slave
  
  New result file from changed test.
sql/field.cc:
  WL#3915 : (NDB) master's cols > slave
  
  Removed warning for unused parameter. Parameter was include for assertion
  and future changes to string class.

Minor change to fix compile problems on 64-bit.

into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-ndb-push


mysql-test/t/disabled.def:
  SCCS merged

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3915_ndb


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/r/rpl_rbr_to_sbr.result:
  Auto merged
mysql-test/r/rpl_row_basic_11bugs.result:
  Auto merged
mysql-test/r/rpl_row_create_table.result:
  Auto merged
mysql-test/r/rpl_row_flsh_tbls.result:
  Auto merged
mysql-test/r/rpl_row_inexist_tbl.result:
  Auto merged
mysql-test/r/rpl_row_log.result:
  Auto merged
mysql-test/r/rpl_row_log_innodb.result:
  Auto merged
mysql-test/r/rpl_row_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_row_until.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
mysql-test/r/rpl_truncate_7ndb.result:
  Auto merged
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
mysql-test/t/rpl_row_flsh_tbls.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/rpl_utility.h:
  Auto merged
BitKeeper/deleted/.del-rpl_colSize.result:
  Delete: mysql-test/r/rpl_colSize.result
BitKeeper/deleted/.del-rpl_colSize.test:
  Delete: mysql-test/t/rpl_colSize.test
mysql-test/r/rpl_ndb_log.result:
  pull merge
  ,
sql/rpl_utility.cc:
   pull merge