into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1

into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1


mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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

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


sql/mysqld.cc:
  Auto merged

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


configure.in:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198

into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198

If the first part was SHOW and second part SELECT, it would have
thought that the command was SELECT, although the first part of
it was SHOW. It would then fail later.

Thus we need to set thd->lex to old_lex (first part) here before going
in to prepare_security().

- remove error set for auto partitioned tables

into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

  rename *.t* to *-t* to be automake-friendly
  simplify Makefiles
test_atomic.c:
  move to unittest, add GPL comment, fix warnings, convert to tap framework.
configure:
  remove custom tests for available types, use AC_CHECK_TYPE instead
x86-gcc.h:
  fix gcc -ansi errors while maintaining readability
ignore:
  added *-t


unittest/mysys/base64-t.c:
  Rename: unittest/mysys/base64.t.c -> unittest/mysys/base64-t.c
unittest/mysys/bitmap-t.c:
  Rename: unittest/mysys/bitmap.t.c -> unittest/mysys/bitmap-t.c
unittest/mytap/t/basic-t.c:
  Rename: unittest/mytap/t/basic.t.c -> unittest/mytap/t/basic-t.c
unittest/examples/no_plan-t.c:
  Rename: unittest/examples/no_plan.t.c -> unittest/examples/no_plan-t.c
unittest/examples/simple-t.c:
  Rename: unittest/examples/simple.t.c -> unittest/examples/simple-t.c
unittest/examples/skip-t.c:
  Rename: unittest/examples/skip.t.c -> unittest/examples/skip-t.c
unittest/examples/skip_all-t.c:
  Rename: unittest/examples/skip_all.t.c -> unittest/examples/skip_all-t.c
unittest/examples/todo-t.c:
  Rename: unittest/examples/todo.t.c -> unittest/examples/todo-t.c
BitKeeper/etc/ignore:
  added *-t
config/ac-macros/misc.m4:
  remove custom AC_TRY_RUN tests for available types, use AC_CHECK_TYPE instead
configure.in:
  remove custom tests for available types, use AC_CHECK_TYPE instead
include/atomic/x86-gcc.h:
  fix gcc -ansi errors while maintaining readability
include/my_global.h:
  remove custom tests for available types, use AC_CHECK_TYPE instead
include/my_sys.h:
  add missing declaration
mysys/Makefile.am:
  move test_atomic to unittest
unittest/Makefile.am:
  simplifications, correct permissions in chmod
unittest/README.txt:
  rename *.t* to *-t* to be automake-friendly
unittest/examples/Makefile.am:
  rename *.t* to *-t* to be automake-friendly
  simplify Makefile
unittest/mysys/Makefile.am:
  rename *.t* to *-t* to be automake-friendly
  simplify Makefile
unittest/mysys/my_atomic-t.c:
  move mysys/test_atomic.c to unittest, add GPL comment, fix warnings,
  convert to tap framework.
unittest/mytap/t/Makefile.am:
  rename *.t* to *-t* to be automake-friendly
  simplify Makefile
unittest/unit.pl:
  rename *.t* to *-t* to be automake-friendly

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


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

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

  Dont be too aggressive in Dbtc::nodeFailCheckTransaction
  let it timeout by 1, so that it does not assert that it has waited too long
  old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.


ndb/src/kernel/blocks/ERROR_codes.txt:
  error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  2 new error inserts
  7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
  7031 - delay in GCP_PREPARE and die
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  autotest

into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198


sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged

- move clear of slock until after completion of data events on the binlog

into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198

into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198


sql/sql_show.cc:
  Auto merged

into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198


sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/item.h:
  manual merge
sql/share/errmsg.txt:
  manual merge

adapting to pushbuild's custom to switch from default pathes. The name for
var directory must be set with MYSQLTEST_VARDIR.


mysql-test/t/mysqlbinlog.test:
  correction of log path since pushbuild uses non-default options.

BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok


mysql-test/r/partition_error.result:
  New test cases
mysql-test/t/partition_error.test:
  New test cases
sql/item.h:
  Added method check_partition_func_processor for check if item tree is valid
sql/item_cmpfunc.h:
  Added method check_partition_func_processor for check if item tree is valid
sql/item_func.h:
  Added method check_partition_func_processor for check if item tree is valid
sql/item_strfunc.h:
  Added method check_partition_func_processor for check if item tree is valid
sql/item_timefunc.h:
  Added method check_partition_func_processor for check if item tree is valid
sql/item_xmlfunc.h:
  Added method check_partition_func_processor for check if item tree is valid

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


include/mysql/plugin.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged

BitKeeper/etc/ignore:
  Added mysys/test_atomic to the ignore list

classes that are compiled conditionally in log_event.cc must be defined conditionally in log_event.h


BitKeeper/deleted/.del-client_priv.h.rej~915a5a16fe10ef0:
  Delete: client/client_priv.h.rej

mysql-test/t/disabled.def:
  enable test

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


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

- wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
+ some current_thd removals
+ enabling kill of sql thread during shema sync wait


mysql-test/r/rpl_ndb_log.result:
  Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ
mysql-test/t/disabled.def:
  Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ

and in SHOW CREATE TABLE


mysql-test/r/information_schema_part.result:
  Added new test cases
mysql-test/t/information_schema_part.test:
  Added new test cases
sql/sql_partition.cc:
  Added missing check for LINEAR keyword on subpartitions
sql/sql_show.cc:
  Added missing check for LINEAR keyword on subpartitions
  Small remove of duplicate code

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


BitKeeper/deleted/.del-ndb_rename.result:
  Delete: mysql-test/r/ndb_rename.result
BitKeeper/deleted/.del-ndb_rename.test:
  Delete: mysql-test/t/ndb_rename.test
sql/ha_ndbcluster.cc:
  Merge (using local)
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Merge (using local)