mysql-test/t/rpl_create_database.test:
  Updated to pass when other default engines are being used
mysql-test/r/rpl_create_database.result:
  Updated to pass when other default engines are being used
mysql-test/t/rpl_row_func003-slave.opt:
  new opt file to enusre innodb on slave
mysql-test/t/rpl_replicate_do.test:
  Updated with order by for use during ndb testing
mysql-test/r/rpl_replicate_do.result:
  Updated with order by for use during ndb testing
mysql-test/t/rpl_redirect.test:
  updated with order by
mysql-test/r/rpl_redirect.result:
  updated with order by
mysql-test/t/rpl_ndb_func003.test:
  New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_ndb_func003.result:
  New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_row_sp001.result:
  updated with order by
mysql-test/t/rpl_row_sp001.test:
  updated with order by
BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f:
  Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_log.test:
  Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
mysql-test/t/rpl_row_log.test:
  part of rpl_log.test check in
mysql-test/r/rpl_row_log.result:
  part of rpl_log.test check in
mysql-test/r/rpl_row_log_innodb.result:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-master.opt:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-slave.opt:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb.test:
  part of rpl_log.test check in
mysql-test/r/rpl_ndb_log.result:
  part of rpl_log.test check in
mysql-test/t/rpl_ndb_log.test:
  part of rpl_log.test check in
mysql-test/t/rpl_ndb_log-master.opt:
  part of rpl_log.test check in
mysql-test/t/disabled.def:
  Updated with MySQL Bugs: #17158

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


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

mysql-test/r/trigger-grant.result:
  Updated result file: use TRIGGER instead of SUPER for BUG#15166/15196 tests.
sql/item.cc:
  Updated according to the 5.1 data structures.

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree


mysql-test/r/trigger-grant.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/trigger-grant.test:
  Merged.
sql/sql_trigger.cc:
  Merged.

mysql-test/t/ctype_ucs.test:
  Auto merged

storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  unlock outstanding locks on scan close

into  mysql.com:/space/pekka/ndb/version/my51

mysql-test/t/disabled.def:
  ndb_blob.test works again, sort of
storage/ndb/include/ndbapi/NdbBlob.hpp:
  better getNull & replace+tinyblob forward-patch from 5.0
storage/ndb/src/ndbapi/NdbBlob.cpp:
  better getNull & replace+tinyblob forward-patch from 5.0
storage/ndb/test/ndbapi/test_event.cpp:
  getEvent()->getTable()
sql/ha_ndbcluster.cc:
  return more error codes from blob calls
sql/ha_ndbcluster_binlog.cc:
  return more error codes from blob calls
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  return more error codes from blob calls
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  copy and invalidate blob tables as part of main table.  TODO: do not cache blob tables
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  copy and invalidate blob tables as part of main table.  TODO: do not cache blob tables

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/field.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  manual merge

mysql-test/t/rpl_relay_space_myisam.test:
  Added Comment
mysql-test/t/rpl_ndb_relay_space.test:
  Added more comments
BitKeeper/deleted/.del-rpl_relay_space_ndb.result~4d6013c0afef9b5e:
  Delete: mysql-test/r/rpl_relay_space_ndb.result
mysql-test/t/rpl_relay_space_innodb.test:
  Added Comment
BitKeeper/deleted/.del-rpl000006.test~6da9f1808deb79c7:
  Delete: mysql-test/t/rpl000006.test
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
  Delete: mysql-test/t/rpl000004.test
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
  Delete: mysql-test/r/rpl000004.result
mysql-test/t/rpl_mixed_ddl_dml.test:
  Rename: mysql-test/t/rpl000002.test -> mysql-test/t/rpl_mixed_ddl_dml.test
mysql-test/r/rpl_mixed_ddl_dml.result:
  Rename: mysql-test/r/rpl000002.result -> mysql-test/r/rpl_mixed_ddl_dml.result
mysql-test/t/rpl_ignore_table_update.test:
  Rename: mysql-test/t/rpl000008.test -> mysql-test/t/rpl_ignore_table_update.test
mysql-test/t/rpl_ignore_table_update-slave.opt:
  Rename: mysql-test/t/rpl000008-slave.opt -> mysql-test/t/rpl_ignore_table_update-slave.opt
mysql-test/r/rpl_ignore_table_update.result:
  Rename: mysql-test/r/rpl000008.result -> mysql-test/r/rpl_ignore_table_update.result
mysql-test/t/rpl_load_table_from_master.test:
  Fixing test since test where combined
mysql-test/r/rpl_load_table_from_master.result:
  Updated results file
BitKeeper/deleted/.del-rpl000004.a.result~3415f066cb91c460:
  Delete: mysql-test/r/rpl000004.a.result
BitKeeper/deleted/.del-rpl000004.b.result~352b35351551485:
  Delete: mysql-test/r/rpl000004.b.result
mysql-test/t/disabled.def:
  added rpl_ndb_relay_space Results are not deterministic
mysql-test/t/rpl_load_from_master.test:
  Rename: mysql-test/t/rpl000009.test -> mysql-test/t/rpl_load_from_master.test
mysql-test/t/rpl_load_from_master-slave.opt:
  Rename: mysql-test/t/rpl000009-slave.opt -> mysql-test/t/rpl_load_from_master-slave.opt
mysql-test/r/rpl_load_from_master.result:
  Rename: mysql-test/r/rpl000009.result -> mysql-test/r/rpl_load_from_master.result
mysql-test/t/rpl_temp_table.test:
  Rename: mysql-test/t/rpl_000012.test -> mysql-test/t/rpl_temp_table.test
mysql-test/r/rpl_temp_table.result:
  Rename: mysql-test/r/rpl_000012.result -> mysql-test/r/rpl_temp_table.result

into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree

The idea of this merge is to "synchronize" 5.1-release tree (5.1.6) and
the main 5.1 tree. A patch for BUG#15588/BUG#16621 was copied into
5.1-release from 5.0 since it is important. This patch is expected to
come into the 5.1 tree after resolving 5.0 -> 5.1 megrge logjam.


storage/example/ha_example.cc:
  Auto merged
sql/field.cc:
  Ignore changes in 5.1-release (5.1.6).
sql/sp_head.cc:
  Ignore changes in 5.1-release (5.1.6).

mysql-test/t/rpl000004.test:
  Updated test so it would not fail when MyISAM was not default Engine
mysql-test/r/rpl000004.result:
  Updated test so it would not fail when MyISAM was not default Engine
mysql-test/extra/rpl_tests/rpl000006.test:
  Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl000006.result:
  Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl_relay_space_myisam.result:
  Rename: mysql-test/r/rpl000005.result -> mysql-test/r/rpl_relay_space_myisam.result
mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
  Had to split the test cases out to use for each engine. Reason being that the data goes applies to ndb in different order. So it has to have its own result file and I want to ensure that it is not used for other tests when ndb is used as default engine. Old test case was called rpl000009.test, so it was renamed as well to give the test more meaning
mysql-test/t/rpl_relay_space_innodb-master.opt:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb-slave.opt:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb.test:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_myisam.test:
  Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_ndb_relay_space.test:
  Wrapper for old test case called rpl000009.test
mysql-test/r/rpl_ndb_relay_space.result:
  Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_innodb.result:
  Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_ndb.result:
  Result file for wrapper for old test case called rpl000009.test
mysql-test/t/rpl000009.test:
  updated to work when ndb is default engine
mysql-test/r/rpl000009.result:
  updated to work when ndb is default engine
mysql-test/t/rpl_LD_INFILE.test:
  Plan test cleanup
mysql-test/r/rpl_LD_INFILE.result:
  Plan test cleanup
mysql-test/t/rpl_auto_increment-slave.opt:
  needed to ensure test does not fail if default engine is specified
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
  Sorry, forgot to cleanup from debugging
mysql-test/t/rpl_ndb_auto_inc.test:
  New wrapper for NDB
mysql-test/t/rpl_ndb_auto_inc-master.opt:
  New wrapper for NDB
mysql-test/r/rpl_ndb_auto_inc.result:
  New wrapper for NDB
mysql-test/t/disabled.def:
  Updated

sql/field.cc:
  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);
sql/sp_head.cc:
  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.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/ndb/include/logger/LogHandler.hpp:
  Auto merged
storage/ndb/include/logger/Logger.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/logger/SysLogHandler.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
zlib/Makefile.am:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged
mysql-test/t/information_schema.test:
  Manual merge.
sql/ha_archive.cc:
  Manual merge.
sql/share/errmsg.txt:
  SCCS merged
tests/mysql_client_test.c:
  Manual merge.

into  mysql.com:/home/dlenev/src/mysql-5.1-merges


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

    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:
  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.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqldump.c:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql51


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

    enable extra logging in ndb handler during test runs


mysql-test/mysql-test-run.pl:
  enable extra logging in ndb handler during test runs
sql/ha_ndbcluster_binlog.cc:
  added more logging in ndb handler

configure.in:
  To configure InnoDB for cross compilation.
include/config-netware.h:
  NetWare specific change to fix the compilation errors caused by event.h
  NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
  and zlib(1.2.3)
netware/BUILD/compile-AUTOTOOLS:
  Netware specific change reflecting the change in source code
  directory structure.
netware/BUILD/compile-linux-tools:
  Netware specific change to fix the location where gen_lex_hash
  gets created. Fixed also directory structure reflecting changes.
netware/BUILD/compile-netware-END:
  Netware specific change for creating mysqld_error.h
netware/BUILD/mwenv:
  Netware specific change required for WINE PATH and for
  new versions LibC(Jun 05) and zlib(1.2.3).
netware/BUILD/nwbootstrap:
  NetWare Specific change to produce absoulte path for XDC file.
netware/Makefile.am:
  Netware specific changes to fix to match new
  directory structure.
netware/my_manage.h:
  Netware specific change required for WINE PATH and for new versions
  LibC(Jun 05) and zlib(1.2.3).
netware/mysql_test_run.c:
  Netware specific change, added --autoclose option for mysql_test_run.nlm.
scripts/make_binary_distribution.sh:
  Fix to reflect change in directory structure.
sql/mysqld.cc:
  Stacksize change for Netware.
  Netware specific change to fix the compilation errors caused by event.h
sql/set_var.cc:
  Minor indending related fix.
sql/sql_class.cc:
  Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
storage/innobase/os/os0thread.c:
  Netware specific change to increase the thread stack size.
storage/myisam/mi_locking.c:
  Enclosed MMAP related code under HAVE_MMAP preprocessor directive.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/innodb.result:
  Manual merge: null merge, use local.
mysql-test/t/innodb.test:
  Manual merge: null merge, use local.
sql/ha_innodb.cc:
  Manual merge: null merge, use local.
sql/ha_innodb.h:
  Manual merge: null merge, use local.
sql/mysqld.cc:
  Manual merge: null merge, use local.
sql/set_var.cc:
  Manual merge: null merge, use local.
storage/innobase/include/srv0srv.h:
  Manual merge: null merge, use local.
storage/innobase/srv/srv0srv.c:
  Manual merge: null merge, use local.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysys/my_bitmap.c:
  Manual merge
sql/field.cc:
  e
  Manual merge
sql/item.cc:
  Manual merge (new Field_bit_as_char constructor signature)
sql/item_func.cc:
  Manual merge: use local
sql/sql_insert.cc:
  Manual merge: add VOID() around bitmap_init

into  mysql.com:/home/dlenev/src/mysql-5.1-bfix

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.


mysql-test/r/system_mysql_db.result:
  Updated test results after addition of TRIGGER privilege.
mysql-test/t/disabled.def:
  Enabled back test system_mysql_db/system_mysql_db_fix tests.
scripts/mysql_fix_privilege_tables.sql:
  Corrected addition of TRIGGER privilege.

into  poseidon.ndb.mysql.com:/home/tomas/mysql51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqltest.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
sql/sql_yacc.yy:
  Manual merge: resolve the conflict with moved sp_if rule

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new