Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

1 files changed, 50 insertions, 51 deletions

diff --git a/.bzrignore b/.bzrignore
index d19b005a03e..c9f9f140366 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -361,8 +361,11 @@ libmysqld/examples/link_sources
 libmysqld/examples/my_readline.h
 libmysqld/examples/mysql
 libmysqld/examples/mysql.cc
+libmysqld/examples/mysql_client_test.c
+libmysqld/examples/mysql_client_test_embedded
 libmysqld/examples/mysqltest
 libmysqld/examples/mysqltest.c
+libmysqld/examples/mysqltest_embedded
 libmysqld/examples/readline.cc
 libmysqld/examples/sql_string.cc
 libmysqld/examples/sql_string.h
@@ -727,13 +730,45 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so
 ndb/lib/libREP_API.so
 ndb/lib/libndbclient.so
 ndb/lib/libndbclient_extra.so
+ndb/src/common/debugger/libtrace.dsp
+ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
+ndb/src/common/logger/liblogger.dsp
+ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
 ndb/src/common/mgmcommon/printConfig/*.d
+ndb/src/common/portlib/libportlib.dsp
+ndb/src/common/transporter/libtransporter.dsp
+ndb/src/common/util/libgeneral.dsp
 ndb/src/cw/cpcd/ndb_cpcd
+ndb/src/kernel/blocks/backup/libbackup.dsp
 ndb/src/kernel/blocks/backup/restore/ndb_restore
+ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
+ndb/src/kernel/blocks/dbacc/libdbacc.dsp
+ndb/src/kernel/blocks/dbdict/libdbdict.dsp
+ndb/src/kernel/blocks/dbdih/libdbdih.dsp
+ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+ndb/src/kernel/blocks/dbtc/libdbtc.dsp
+ndb/src/kernel/blocks/dbtup/libdbtup.dsp
+ndb/src/kernel/blocks/dbtux/libdbtux.dsp
+ndb/src/kernel/blocks/dbutil/libdbutil.dsp
+ndb/src/kernel/blocks/grep/libgrep.dsp
+ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
+ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
+ndb/src/kernel/blocks/qmgr/libqmgr.dsp
+ndb/src/kernel/blocks/suma/libsuma.dsp
+ndb/src/kernel/blocks/trix/libtrix.dsp
+ndb/src/kernel/error/liberror.dsp
 ndb/src/kernel/ndbd
+ndb/src/kernel/ndbd.dsp
+ndb/src/kernel/vm/libkernel.dsp
+ndb/src/libndbclient.dsp
+ndb/src/mgmapi/libmgmapi.dsp
+ndb/src/mgmclient/libndbmgmclient.dsp
 ndb/src/mgmclient/ndb_mgm
+ndb/src/mgmclient/ndb_mgm.dsp
 ndb/src/mgmclient/test_cpcd/*.d
 ndb/src/mgmsrv/ndb_mgmd
+ndb/src/mgmsrv/ndb_mgmd.dsp
+ndb/src/ndbapi/libndbapi.dsp
 ndb/test/ndbapi/bank/bankCreator
 ndb/test/ndbapi/bank/bankMakeGL
 ndb/test/ndbapi/bank/bankSumAccounts
@@ -746,12 +781,15 @@ ndb/test/ndbapi/create_tab
 ndb/test/ndbapi/drop_all_tabs
 ndb/test/ndbapi/flexAsynch
 ndb/test/ndbapi/flexBench
+ndb/test/ndbapi/flexBench.dsp
 ndb/test/ndbapi/flexHammer
 ndb/test/ndbapi/flexTT
 ndb/test/ndbapi/testBackup
 ndb/test/ndbapi/testBasic
+ndb/test/ndbapi/testBasic.dsp
 ndb/test/ndbapi/testBasicAsynch
 ndb/test/ndbapi/testBlobs
+ndb/test/ndbapi/testBlobs.dsp
 ndb/test/ndbapi/testDataBuffers
 ndb/test/ndbapi/testDeadlock
 ndb/test/ndbapi/testDict
@@ -763,6 +801,7 @@ ndb/test/ndbapi/testOIBasic
 ndb/test/ndbapi/testOperations
 ndb/test/ndbapi/testRestartGci
 ndb/test/ndbapi/testScan
+ndb/test/ndbapi/testScan.dsp
 ndb/test/ndbapi/testScanInterpreter
 ndb/test/ndbapi/testScanPerf
 ndb/test/ndbapi/testSystemRestart
@@ -770,6 +809,7 @@ ndb/test/ndbapi/testTimeout
 ndb/test/ndbapi/testTransactions
 ndb/test/ndbapi/test_event
 ndb/test/run-test/atrt
+ndb/test/src/libNDBT.dsp
 ndb/test/tools/copy_tab
 ndb/test/tools/create_index
 ndb/test/tools/hugoCalculator
@@ -786,15 +826,23 @@ ndb/test/tools/ndb_cpcc
 ndb/test/tools/restart
 ndb/test/tools/verify_index
 ndb/tools/ndb_delete_all
+ndb/tools/ndb_delete_all.dsp
 ndb/tools/ndb_desc
+ndb/tools/ndb_desc.dsp
 ndb/tools/ndb_drop_index
+ndb/tools/ndb_drop_index.dsp
 ndb/tools/ndb_drop_table
+ndb/tools/ndb_drop_table.dsp
 ndb/tools/ndb_restore
 ndb/tools/ndb_select_all
+ndb/tools/ndb_select_all.dsp
 ndb/tools/ndb_select_count
+ndb/tools/ndb_select_count.dsp
 ndb/tools/ndb_show_tables
+ndb/tools/ndb_show_tables.dsp
 ndb/tools/ndb_test_platform
 ndb/tools/ndb_waiter
+ndb/tools/ndb_waiter.dsp
 ndbcluster-1186
 ndbcluster-1186/SCCS
 ndbcluster-1186/config.ini
@@ -936,6 +984,7 @@ support-files/mysql-3.23.29-gamma.spec
 support-files/mysql-log-rotate
 support-files/mysql.server
 support-files/mysql.spec
+support-files/ndb-config-2-node.ini
 tags
 test/ndbapi/bank/bankCreator
 test/ndbapi/bank/bankMakeGL
@@ -991,6 +1040,7 @@ test/tools/verify_index
 test_xml
 tests/client_test
 tests/connect_test
+tests/mysql_client_test
 thread_test
 tmp/*
 tools/my_vsnprintf.c
@@ -1002,54 +1052,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-tests/mysql_client_test
-tests/mysql_client_test
-libmysqld/examples/mysql_client_test.c
-libmysqld/examples/mysql_client_test_embedded
-libmysqld/examples/mysqltest_embedded
-ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
-ndb/src/common/debugger/libtrace.dsp
-ndb/src/common/logger/liblogger.dsp
-ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
-ndb/src/common/portlib/libportlib.dsp
-ndb/src/common/transporter/libtransporter.dsp
-ndb/src/common/util/libgeneral.dsp
-ndb/src/kernel/blocks/backup/libbackup.dsp
-ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
-ndb/src/kernel/blocks/dbacc/libdbacc.dsp
-ndb/src/kernel/blocks/dbdict/libdbdict.dsp
-ndb/src/kernel/blocks/dbdih/libdbdih.dsp
-ndb/src/kernel/blocks/dblqh/libdblqh.dsp
-ndb/src/kernel/blocks/dbtc/libdbtc.dsp
-ndb/src/kernel/blocks/dbtup/libdbtup.dsp
-ndb/src/kernel/blocks/dbtux/libdbtux.dsp
-ndb/src/kernel/blocks/dbutil/libdbutil.dsp
-ndb/src/kernel/blocks/grep/libgrep.dsp
-ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
-ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
-ndb/src/kernel/blocks/qmgr/libqmgr.dsp
-ndb/src/kernel/blocks/suma/libsuma.dsp
-ndb/src/kernel/blocks/trix/libtrix.dsp
-ndb/src/kernel/error/liberror.dsp
-ndb/src/kernel/vm/libkernel.dsp
-ndb/src/kernel/ndbd.dsp
-ndb/src/mgmapi/libmgmapi.dsp
-ndb/src/mgmclient/ndb_mgm.dsp
-ndb/src/mgmclient/libndbmgmclient.dsp
-ndb/src/mgmsrv/ndb_mgmd.dsp
-ndb/src/ndbapi/libndbapi.dsp
-ndb/src/libndbclient.dsp
-ndb/test/ndbapi/flexBench.dsp
-ndb/test/ndbapi/testBasic.dsp
-ndb/test/ndbapi/testBlobs.dsp
-ndb/test/ndbapi/testScan.dsp
-ndb/test/src/libNDBT.dsp
-ndb/tools/ndb_waiter.dsp
-ndb/tools/ndb_drop_table.dsp
-ndb/tools/ndb_delete_all.dsp
-ndb/tools/ndb_desc.dsp
-ndb/tools/ndb_drop_index.dsp
-ndb/tools/ndb_show_tables.dsp
-ndb/tools/ndb_select_all.dsp
-ndb/tools/ndb_select_count.dsp
-support-files/ndb-config-2-node.ini