into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-09-08

Fix autotest of backups
Fix autotest with mysql-test-run


ndb/test/run-test/atrt-testBackup:
  Rename: ndb/test/ndbapi/atrt-testBackup -> ndb/test/run-test/atrt-testBackup
ndb/test/run-test/Makefile.am:
  Install atrt wrappers
ndb/test/run-test/atrt-mysql-test-run:
  Take args from caller
ndb/test/run-test/daily-devel-tests.txt:
  Use wrapper to test backup
ndb/test/run-test/main.cpp:
  Add MYSQL_BASE_DIR to environment of test programs

ndb/src/kernel/blocks/backup/Backup.cpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/Backup.hpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/restore/consumer.hpp:
  Introduced endOfTables into Consumer interface
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Run endOfTables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb

Reset SIGCHLD before exec-ing


ndb/src/cw/cpcd/Process.cpp:
  Reset SIGCHLD before exec-ing

fix delete of dictionary before connection has been established


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix delete of dictionary before connection has been established

Make sure to flush buffer when sending long sig so that order is maintained

Use const table * in NDB API


ndb/include/ndbapi/Ndb.hpp:
  Removed useFullyQualifiedNames(bool)
  Changed so that auto increment methods takes const pointer
ndb/include/ndbapi/NdbBlob.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbConnection.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbOperation.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbScanOperation.hpp:
  Changed to const table pointer
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Corrected size & array size in case of blob usage
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
  Removed use fully qualified name
  Handle blob tables
ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp:
  Introduced mapping between old/new table (wrt ids)
ndb/src/kernel/blocks/backup/restore/main.cpp:
  removed extra Uint32
ndb/src/ndbapi/Ndb.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbConnection.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbOperation.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbScanOperation.cpp:
  Changed to const table pointer
sql/ha_ndbcluster.cc:
  Changed to const table pointer

into mysql.com:/home/jonas/src/mysql-4.1-ndb

added testcase

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Dont't use signal->theData for checking as it is overwritten when
  using keyinfo

into poseidon.(none):/home/tomas/mysql-4.1-ndb

+ fix for support of multiple mgmt servers


mysql-test/r/ndb_alter_table.result:
  added test case for bug #5431
mysql-test/t/ndb_alter_table.test:
  added test case for bug #5431
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  fix to make multiple mgmt srvrs work
sql/ha_ndbcluster.cc:
  fixed and added test case for bug#5431

into poseidon.(none):/home/tomas/mysql-4.1-ndb

fixed some error codes in Ndb so that 4009-cluster failure is returned when cluster is not up

into mysql.com:/home/jonas/src/mysql-4.1-ndb

ndb/test/ndbapi/testReadPerf.cpp:
  clear g_times if compiler don't do it for you

-i depricated on ndbd
fixed bug in shutdown command in ndb_mgm


ndb/src/mgmsrv/main.cpp:
  added config.ini as default configuration file
  -d default on ndb_mgmd and ndbd
  -i depricated on ndbd
  fixed bug in shutdown command in ndb_mgm

Divide by loops aswell


ndb/test/ndbapi/testReadPerf.cpp:
  Divide by loops aswell

into poseidon.(none):/home/tomas/mysql-4.1-ndb


sql/sql_class.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

fixed memory leak in object map
fixed uninitialized value blobs_pending


ndb/include/mgmapi/mgmapi.h:
  added ndb_mgm_destroy_configuration call
ndb/src/mgmapi/mgmapi.cpp:
  added ndb_mgm_destroy_configuration call
ndb/src/ndbapi/ObjectMap.hpp:
  fixed memory leak
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added ndb_mgm_destroy_configuration call
sql/ha_ndbcluster.cc:
  fixed uninitialized value blobs_pending

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

- pk read (batch and serial)
- unique index read (batch and serial)
- eq-bound ordered index
- range ordered index
- sorted range ordered index
- interpretered scan


ndb/test/ndbapi/Makefile.am:
  Added testReadPerf
ndb/test/ndbapi/testScanPerf.cpp:
  Removed old #ifdef'ed code

configure.in:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
mysql-test/r/union.result:
  Merge with 4.0
mysql-test/t/union.test:
  Merge with 4.0
sql/ha_innodb.cc:
  Merge with 4.0
sql/share/german/errmsg.txt:
  Merge with 4.0
sql/share/portuguese/errmsg.txt:
  Merge with 4.0
sql/share/russian/errmsg.txt:
  Merge with 4.0
sql/sql_parse.cc:
  Merge with 4.0
sql/sql_union.cc:
  Merge with 4.0 (Keep 4.1 code)

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1

server': the bug occurs when arguments of LIKE function are in 
differentcharacter sets. If these character sets are compatible, 
we create an item-converter. In prepared mode, this item
needs to be created in memory of current prepared statement.


mysql-test/r/ps.result:
  Test for Bug#4368 added.
mysql-test/t/ps.test:
  A test case for bug#4368 '"like" fails in PreparedStatement, 
  crashes server'.

configure.in:
  define macro "DEFINE_ALL_CHARACTER_SETS" completely