merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  merge (Use heikki's code)

1 files changed, 134 insertions, 133 deletions

diff --git a/.bzrignore b/.bzrignore
index ecf75375906..3344a057180 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -2,6 +2,7 @@
 *.bb
 *.bbg
 *.core
+*.d
 *.da
 *.gcov
 *.la
@@ -13,10 +14,10 @@
 */.pure
 *~
 .*.swp
-.deps
+.defs.mk
 .depend
 .depend.mk
-.defs.mk
+.deps
 .gdb_history
 .gdbinit
 .libs
@@ -287,6 +288,7 @@ help.h
 include/my_config.h
 include/my_global.h
 include/mysql_version.h
+include/readline
 include/readline/*.h
 include/readline/readline.h
 include/widec.h
@@ -328,7 +330,9 @@ libmysqld/client.c
 libmysqld/client_settings.h
 libmysqld/convert.cc
 libmysqld/derror.cc
+libmysqld/discover.cc
 libmysqld/errmsg.c
+libmysqld/examples/client_test.c
 libmysqld/examples/completion_hash.cc
 libmysqld/examples/completion_hash.h
 libmysqld/examples/link_sources
@@ -432,6 +436,7 @@ libmysqld/strfunc.cc
 libmysqld/table.cc
 libmysqld/thr_malloc.cc
 libmysqld/time.cc
+libmysqld/tztime.cc
 libmysqld/uniques.cc
 libmysqld/unireg.cc
 libtool
@@ -485,6 +490,7 @@ mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
 mysql-test/gmon.out
 mysql-test/install_test_db
 mysql-test/mysql-test-run
+mysql-test/ndb/ndbcluster
 mysql-test/r/*.reject
 mysql-test/r/rpl000001.eval
 mysql-test/r/rpl000002.eval
@@ -515,6 +521,130 @@ mysys/test_thr_alarm
 mysys/test_thr_lock
 mysys/test_vsnprintf
 mysys/testhash
+ndb/bin/DbAsyncGenerator
+ndb/bin/DbCreate
+ndb/bin/acid
+ndb/bin/async-lmc-bench-l-p10.sh
+ndb/bin/async-lmc-bench-l.sh
+ndb/bin/async-lmc-bench-p10.sh
+ndb/bin/async-lmc-bench.sh
+ndb/bin/atrt
+ndb/bin/atrt-analyze-result.sh
+ndb/bin/atrt-clear-result.sh
+ndb/bin/atrt-gather-result.sh
+ndb/bin/atrt-setup.sh
+ndb/bin/bankCreator
+ndb/bin/bankMakeGL
+ndb/bin/bankSumAccounts
+ndb/bin/bankTimer
+ndb/bin/bankTransactionMaker
+ndb/bin/bankValidateAllGLs
+ndb/bin/basicTransporterTest
+ndb/bin/benchronja
+ndb/bin/bulk_copy
+ndb/bin/copy_tab
+ndb/bin/create_all_tabs
+ndb/bin/create_index
+ndb/bin/create_tab
+ndb/bin/delete_all
+ndb/bin/desc
+ndb/bin/drop_all_tabs
+ndb/bin/drop_index
+ndb/bin/drop_tab
+ndb/bin/flexAsynch
+ndb/bin/flexBench
+ndb/bin/flexHammer
+ndb/bin/flexScan
+ndb/bin/flexTT
+ndb/bin/hugoCalculator
+ndb/bin/hugoFill
+ndb/bin/hugoLoad
+ndb/bin/hugoLockRecords
+ndb/bin/hugoPkDelete
+ndb/bin/hugoPkRead
+ndb/bin/hugoPkReadRecord
+ndb/bin/hugoPkUpdate
+ndb/bin/hugoScanRead
+ndb/bin/hugoScanUpdate
+ndb/bin/index
+ndb/bin/index2
+ndb/bin/initronja
+ndb/bin/interpreterInTup
+ndb/bin/list_tables
+ndb/bin/make-config.sh
+ndb/bin/mgmtclient
+ndb/bin/mgmtsrvr
+ndb/bin/mkconfig
+ndb/bin/ndb
+ndb/bin/ndb_cpcc
+ndb/bin/ndb_cpcd
+ndb/bin/ndb_rep
+ndb/bin/ndbsql
+ndb/bin/newton_basic
+ndb/bin/newton_br
+ndb/bin/newton_pb
+ndb/bin/newton_perf
+ndb/bin/perfTransporterTest
+ndb/bin/printConfig
+ndb/bin/printSchemafile
+ndb/bin/printSysfile
+ndb/bin/redoLogFileReader
+ndb/bin/restart
+ndb/bin/restarter
+ndb/bin/restarter2
+ndb/bin/restarts
+ndb/bin/restore
+ndb/bin/select_all
+ndb/bin/select_count
+ndb/bin/telco
+ndb/bin/testBackup
+ndb/bin/testBank
+ndb/bin/testBasic
+ndb/bin/testBasicAsynch
+ndb/bin/testCopy
+ndb/bin/testDataBuffers
+ndb/bin/testDict
+ndb/bin/testGrep
+ndb/bin/testGrepVerify
+ndb/bin/testIndex
+ndb/bin/testInterpreter
+ndb/bin/testKernelDataBuffer
+ndb/bin/testLongSig
+ndb/bin/testMgm
+ndb/bin/testMgmapi
+ndb/bin/testNdbApi
+ndb/bin/testNodeRestart
+ndb/bin/testOIBasic
+ndb/bin/testOdbcDriver
+ndb/bin/testOperations
+ndb/bin/testRestartGci
+ndb/bin/testScan
+ndb/bin/testScanInterpreter
+ndb/bin/testSimplePropertiesSection
+ndb/bin/testSystemRestart
+ndb/bin/testTimeout
+ndb/bin/testTransactions
+ndb/bin/test_cpcd
+ndb/bin/test_event
+ndb/bin/verify_index
+ndb/bin/waiter
+ndb/config/autom4te.cache/*
+ndb/config/config.mk
+ndb/examples/ndbapi_example1/ndbapi_example1
+ndb/examples/ndbapi_example2/ndbapi_example2
+ndb/examples/ndbapi_example3/ndbapi_example3
+ndb/examples/ndbapi_example5/ndbapi_example5
+ndb/examples/select_all/select_all
+ndb/lib/libMGM_API.so
+ndb/lib/libNDB_API.so
+ndb/lib/libNDB_ODBC.so
+ndb/lib/libNEWTON_API.so
+ndb/lib/libNEWTON_BASICTEST_COMMON.so
+ndb/lib/libREP_API.so
+ndb/lib/libndbclient.so
+ndb/lib/libndbclient_extra.so
+ndb/src/common/mgmcommon/printConfig/*.d
+ndb/src/mgmclient/test_cpcd/*.d
 pull.log
 regex/re
 repl-tests/test-repl-ts/repl-timestamp.master.reject
@@ -585,6 +715,7 @@ sql/gen_lex_hash
 sql/gmon.out
 sql/lex_hash.h
 sql/mini_client_errors.c
+sql/mysql_tzinfo_to_sql
 sql/mysqlbinlog
 sql/mysqld
 sql/mysqld-purecov
@@ -604,6 +735,7 @@ sql/sql_yacc.cc
 sql/sql_yacc.h
 sql/sql_yacc.output
 sql/sql_yacc.yy.orig
+sql/test_time
 sql/udf_example.so
 sql_error.cc
 sql_prepare.cc
@@ -652,134 +784,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-ndb/bin/DbAsyncGenerator
-ndb/bin/DbCreate
-ndb/bin/acid
-ndb/bin/async-lmc-bench-l-p10.sh
-ndb/bin/async-lmc-bench-l.sh
-ndb/bin/async-lmc-bench-p10.sh
-ndb/bin/async-lmc-bench.sh
-ndb/bin/atrt
-ndb/bin/atrt-analyze-result.sh
-ndb/bin/atrt-clear-result.sh
-ndb/bin/atrt-gather-result.sh
-ndb/bin/atrt-setup.sh
-ndb/bin/bankCreator
-ndb/bin/bankMakeGL
-ndb/bin/bankSumAccounts
-ndb/bin/bankTimer
-ndb/bin/bankTransactionMaker
-ndb/bin/bankValidateAllGLs
-ndb/bin/basicTransporterTest
-ndb/bin/benchronja
-ndb/bin/bulk_copy
-ndb/bin/copy_tab
-ndb/bin/create_all_tabs
-ndb/bin/create_index
-ndb/bin/create_tab
-ndb/bin/delete_all
-ndb/bin/desc
-ndb/bin/drop_all_tabs
-ndb/bin/drop_index
-ndb/bin/drop_tab
-ndb/bin/flexAsynch
-ndb/bin/flexBench
-ndb/bin/flexHammer
-ndb/bin/flexScan
-ndb/bin/flexTT
-ndb/bin/hugoCalculator
-ndb/bin/hugoFill
-ndb/bin/hugoLoad
-ndb/bin/hugoLockRecords
-ndb/bin/hugoPkDelete
-ndb/bin/hugoPkRead
-ndb/bin/hugoPkReadRecord
-ndb/bin/hugoPkUpdate
-ndb/bin/hugoScanRead
-ndb/bin/hugoScanUpdate
-ndb/bin/index
-ndb/bin/index2
-ndb/bin/initronja
-ndb/bin/interpreterInTup
-ndb/bin/list_tables
-ndb/bin/make-config.sh
-ndb/bin/mgmtclient
-ndb/bin/mgmtsrvr
-ndb/bin/mkconfig
-ndb/bin/ndb
-ndb/bin/ndb_cpcc
-ndb/bin/ndb_cpcd
-ndb/bin/ndb_rep
-ndb/bin/ndbsql
-ndb/bin/newton_basic
-ndb/bin/newton_br
-ndb/bin/newton_pb
-ndb/bin/newton_perf
-ndb/bin/perfTransporterTest
-ndb/bin/printConfig
-ndb/bin/printSchemafile
-ndb/bin/printSysfile
-ndb/bin/redoLogFileReader
-ndb/bin/restart
-ndb/bin/restarter
-ndb/bin/restarter2
-ndb/bin/restarts
-ndb/bin/restore
-ndb/bin/select_all
-ndb/bin/select_count
-ndb/bin/telco
-ndb/bin/testBackup
-ndb/bin/testBank
-ndb/bin/testBasic
-ndb/bin/testBasicAsynch
-ndb/bin/testCopy
-ndb/bin/testDataBuffers
-ndb/bin/testDict
-ndb/bin/testGrep
-ndb/bin/testGrepVerify
-ndb/bin/testIndex
-ndb/bin/testInterpreter
-ndb/bin/testKernelDataBuffer
-ndb/bin/testLongSig
-ndb/bin/testMgm
-ndb/bin/testMgmapi
-ndb/bin/testNdbApi
-ndb/bin/testNodeRestart
-ndb/bin/testOIBasic
-ndb/bin/testOdbcDriver
-ndb/bin/testOperations
-ndb/bin/testRestartGci
-ndb/bin/testScan
-ndb/bin/testScanInterpreter
-ndb/bin/testSimplePropertiesSection
-ndb/bin/testSystemRestart
-ndb/bin/testTimeout
-ndb/bin/testTransactions
-ndb/bin/test_cpcd
-ndb/bin/test_event
-ndb/bin/verify_index
-ndb/bin/waiter
-ndb/examples/ndbapi_example1/ndbapi_example1
-ndb/examples/ndbapi_example2/ndbapi_example2
-ndb/examples/ndbapi_example3/ndbapi_example3
-ndb/examples/ndbapi_example5/ndbapi_example5
-ndb/examples/select_all/select_all
-ndb/lib/libMGM_API.so
-ndb/lib/libNDB_API.so
-ndb/lib/libNDB_ODBC.so
-ndb/lib/libNEWTON_API.so
-ndb/lib/libNEWTON_BASICTEST_COMMON.so
-ndb/lib/libREP_API.so
-ndb/lib/libndbclient.so
-ndb/lib/libndbclient_extra.so
-libmysqld/discover.cc
-include/readline
-ndb/config/autom4te.cache/*
-ndb/config/config.mk
-ndb/src/common/mgmcommon/printConfig/*.d
-ndb/src/mgmclient/test_cpcd/*.d
-*.d
-libmysqld/examples/client_test.c
-sql/test_time
-sql/mysql_tzinfo_to_sql
-libmysqld/tztime.cc