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

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

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

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge

into  mysql.com:/usr/home/bar/mysql-5.1.new.ctype

A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
  Adding new function
Makefile.am:
  Adding build rules for uctypedump,
  a dump tool to create my_uctype.h
  using Unicode Character Database file.
m_ctype.h:
  Adding declaration of my_uni_ctype,
  ctype data for Unicode.
  Adding new member into MY_CHARSET_HANDLER
Makefile.am:
  Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
  new files:
  ctype data for unicode,
  and the tool to generate it from 
  a Unicode Character Database file.



include/Makefile.am:
  Adding my_uctype.h
include/m_ctype.h:
  Adding declaration of my_uni_ctype,
  ctype data for Unicode.
strings/Makefile.am:
  Adding build rules for uctypedump,
  a dump tool to create my_uctype.h
  using Unicode Character Database file.
strings/ctype-big5.c:
  Adding new function
strings/ctype-bin.c:
  Adding new function
strings/ctype-cp932.c:
  Adding new function
strings/ctype-euc_kr.c:
  Adding new function
strings/ctype-eucjpms.c:
  Adding new function
strings/ctype-gb2312.c:
  Adding new function
strings/ctype-gbk.c:
  Adding new function
strings/ctype-latin1.c:
  Adding new function
strings/ctype-mb.c:
  Adding new function
strings/ctype-simple.c:
  Adding new function
strings/ctype-sjis.c:
  Adding new function
strings/ctype-tis620.c:
  Adding new function
strings/ctype-ucs2.c:
  Adding new function
strings/ctype-ujis.c:
  Adding new function
strings/ctype-utf8.c:
  Adding new function

mysql-test/t/disabled.def:
  disabling new test that was added during null-merge from 5.0
  the new test innodb_unsafe_binlog will be re-enabled when the
  5.1 snapshot for InnoDB is applied. Disabling test rather than
  removing files to make future merges easier (removing the files
  would cause merge conflicts when the files are re-added in the
  5.1 snapshot).

sql/ha_ndbcluster.cc:
  ndbcluster_fill_files_table should return int

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge


sql/ha_innodb.cc:
  Auto merged

storage/example/ha_example.cc:
  add handlerton call for fill files table

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
Null-merge InnoDB snapshots from 5.0 to 5.1


storage/innobase/include/lock0lock.h:
  Auto merged
mysql-test/r/innodb.result:
  null-merge from 5.0
mysql-test/t/innodb.test:
  null-merge from 5.0
sql/ha_innodb.cc:
  null-merge from 5.0
storage/innobase/include/data0type.h:
  null-merge from 5.0
storage/innobase/include/data0type.ic:
  null-merge from 5.0
storage/innobase/include/os0file.h:
  null-merge from 5.0
storage/innobase/include/row0mysql.h:
  null-merge from 5.0
storage/innobase/lock/lock0lock.c:
  null-merge from 5.0
storage/innobase/os/os0file.c:
  null-merge from 5.0
storage/innobase/row/row0ins.c:
  null-merge from 5.0
storage/innobase/row/row0mysql.c:
  null-merge from 5.0
storage/innobase/row/row0sel.c:
  null-merge from 5.0
storage/innobase/trx/trx0trx.c:
  null-merge from 5.0

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged

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

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


sql/ha_berkeley.cc:
  Auto merged

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

When we add new privilege we should update mysql-test/lib/init_db.sql
accordingly.


mysql-test/lib/init_db.sql:
  Added TRIGGER privilege.
sql/sql_acl.h:
  Updated comment describing process of addition of new privileges - added yet
  another script place which should be modified when new privilege is added.

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

storage/ndb/src/ndbapi/NdbBlob.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)
storage/ndb/test/ndbapi/test_event_merge.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)

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


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

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged

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

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


mysql-test/r/information_schema.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

fix up test cases.


mysql-test/r/information_schema.result:
  update result for INFORMATION_SCHEMA.FILES
mysql-test/r/information_schema_db.result:
  update result for INFORMATION_SCHEMA.FILES
sql/ha_ndbcluster.cc:
  in fill_files_table, use my_snprintf instead of snprintf
sql/sql_show.cc:
  correct DBUG_ENTER for fill_schema_files
sql/table.h:
  add SCH_FILES to information schema enum

into  mysql.com:/data0/mysqldev/my/mysql-5.1-new


configure.in:
  Null merge.

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


sql/ha_berkeley.cc:
  Use local: manual merge

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

corrected test case

correction

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged