into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

Final review fixes


sql/mysql_priv.h:
  Final review fixes
sql/sql_table.cc:
  Final review fixes

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2


mysql-test/r/index_merge_innodb.result:
  Auto merged
sql/opt_range.cc:
  Auto merged

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2

into  rurik.mysql.com:/home/igor/mysql-5.1

into  mysql.com:/opt/local/work/mysql-5.1-merge

mi_open() should accept filename w/i extension and with .MYI

into  mysql.com:/opt/local/work/mysql-5.1-merge

into  rurik.mysql.com:/home/igor/mysql-5.1

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

Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes

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


storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  Merge, will generate new result file manually
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge

Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want.


extra/yassl/taocrypt/cmakelists.txt:
  Don't write anything about /GX or /EHsc as cmake will detect that and turn exception handling ON. Since it's off by default, that is what we want.

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

into  mysql.com:/home/bk/b17400-mysql-5.1-new

Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.


BitKeeper/deleted/.del-rpl_ndb_relay_space.test~55e5e4b13d3936d0:
  Delete: mysql-test/t/rpl_ndb_relay_space.test
BitKeeper/deleted/.del-rpl_ndb_relay_space.result~a44835cdd2210d18:
  Delete: mysql-test/r/rpl_ndb_relay_space.result

Fixed up create_handler_files call


sql/ha_ndbcluster.cc:
  Fixed up create_handler_files call
sql/ha_partition.cc:
  Fixed up create_handler_files call
sql/handler.h:
  Fixed up create_handler_files call
sql/sql_table.cc:
  Fixed up create_handler_files call
sql/unireg.cc:
  Fixed up create_handler_files call

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BUILD/SETUP.sh:
  manual merge
BUILD/compile-pentium-debug-max:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster.h:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/ha_partition.h:
  manual merge
sql/handler.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
sql/unireg.cc:
  manual merge

Actual error reported in my_errno from my_delete


sql/sql_table.cc:
  Actual error reported in my_errno from my_delete

Various bug fixes (mostly mixed to and from in replace methods)


sql/sql_partition.cc:
  Various bug fixes (mostly mixed to and from in replace methods)
sql/sql_table.cc:
  Various bug fixes (mostly mixed to and from in replace methods)

mysql-test/mysql-test-run.pl:
  Turn on test timing by default, but make it so it can be turned off with
  --notimer. Also clean up the mysql-test-run.pl usage information a little
  bit, and add --benchdir to it.

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/sql_table.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.1-clean

Fixed a number of bugs


sql/sql_table.cc:
  Fixed a number of bugs

mysql-test/t/disabled.def:
  Disabling failing test.

into  rurik.mysql.com:/home/igor/mysql-5.1

into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.

into  c-2709e253.1238-1-64736c10.cust.bredbandsbolaget.se:/Users/mikron/wl2826

Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
+Small fixes


configure.in:
  Moved error inject from being flags to compiler to being part of config.h
  Also error inject only defined if debug is also defined
sql/handler.h:
  Small fixes

into  mysql.com:/home/bk/b17400-mysql-5.1-new

This is not a bug. Enabling disabled test and adding comment.


mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
  Adding comment about test.
mysql-test/r/rpl_ndb_relay_space.result:
  Result change.
mysql-test/r/rpl_relay_space_innodb.result:
  Result change.
mysql-test/r/rpl_relay_space_myisam.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling test

Fixed timeing problem by ignoring failures and results from first select after table definition change


mysql-test/r/ndb_alter_table2.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
mysql-test/r/ndb_alter_table_stm.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe

into  mysql.com:/home/bk/b17400-mysql-5.1-new


mysql-test/t/disabled.def:
  Merge with mysql-5.1-new

into  mysql.com:/home/my/mysql-5.1


mysys/my_access.c:
  Auto merged

ensure check_if_legal_table_name is also defined on unix

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