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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017

sql/ha_ndbcluster.cc:
  calculate frags with (ulonglong)max_rows in case --without-big-tables

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb

ndb/src/kernel/vm/DLHashTable2.hpp:
  add isEmpty for use in DICT
ndb/test/include/NDBT_Tables.hpp:
  getIndexes - return index cols of standard test table
ndb/test/src/NDBT_Tables.cpp:
  getIndexes - return index cols of standard test table
ndb/test/ndbapi/testDict.cpp:
  bug#21017: index create/drop during NR
ndb/include/kernel/signaldata/CreateIndx.hpp:
  add 711
ndb/include/kernel/signaldata/DropIndx.hpp:
  add 711
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  block index create/drop during NR.
  fix 2 ndbrequires by checking exact schema op types
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  block index create/drop during NR.
  fix 2 ndbrequires by checking exact schema op types

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


BitKeeper/deleted/.del-mysql_client.result:
  Auto merged
BitKeeper/deleted/.del-mysql_client.test:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


client/mysql.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


tests/mysql_client_test.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/mysql_client.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/mysql_client.test:
  manual merge
sql/sql_acl.cc:
  manual merge

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328


sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
BitKeeper/deleted/.del-mysql_client.result:
  manual merge
BitKeeper/deleted/.del-mysql_client.test:
  manual merge
mysql-test/r/func_time.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
sql/sql_acl.cc:
  manual merge

mysql-test/r/mysql_client.result:
  Removed OS dependant output.
mysql-test/t/mysql_client.test:
  Re-directed output to a temporary file because the actual output isn't important and was causing a Windows test failure.

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

mysql-test/lib/mtr_misc.pl:
  if running on win32, check for the existence of the file rather than it being executable

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

 Fix testcase to also work on windows


BitKeeper/deleted/.del-mysql_client.test:
  Delete: mysql-test/t/mysql_client.test
BitKeeper/deleted/.del-mysql_client.result:
  Delete: mysql-test/r/mysql_client.result
mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Move tests from mysql_client to mysql
  Fix test case for bug#20328 to work on windows by comparing the output from "help" and "help "

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/mysqld.cc:
  Auto merged

 - Setup LD_LIBRARY_PATH to favor local libs


mysql-test/mysql-test-run.pl:
  Setup LD_LIBRARY_PATH so the libraries from this distro/clone are
  used in favor of the system installed ones

fixes the following valgrind warning (when running ndb_mgm under valgrind,
or, indeed any other mgmapi program listening to events):

==23291== 190 (20 direct, 170 indirect) bytes in 1 blocks are definitely lost in loss record 13 of 22
==23291==    at 0x401C895: operator new(unsigned) (vg_replace_malloc.c:163)
==23291==    by 0x8075300: ParserImpl::run(Parser<ParserImpl::Dummy>::Context*, Properties const**, bool volatile*) const (Parser.cpp:178)
==23291==    by 0x806D09B: Parser<ParserDummy>::parse(Parser<ParserDummy>::Context&, ParserDummy&) (Parser.hpp:219)
==23291==    by 0x80671C4: ndb_mgm_call(ndb_mgm_handle*, ParserRow<ParserDummy> const*, char const*, Properties const*) (mgmapi.cpp:355)
==23291==    by 0x806AB79: ndb_mgm_listen_event_internal(ndb_mgm_handle*, int const*, int) (mgmapi.cpp:1419)
==23291==    by 0x806AC1F: ndb_mgm_listen_event (mgmapi.cpp:1434)
==23291==    by 0x805EB5D: event_thread_run(void*) (CommandInterpreter.cpp:467)
==23291==    by 0x806F70A: ndb_thread_wrapper (NdbThread.c:68)
==23291==    by 0x4042340: start_thread (in /lib/tls/i686/cmov/libpthread-2.3.6.so)
==23291==    by 0x429D4ED: clone (in /lib/tls/i686/cmov/libc-2.3.6.so)


ndb/src/mgmapi/mgmapi.cpp:
  fix memory leak for mgmapi event listeners (1 per connect)
  
  (missing delete of reply Properties object returned by ndb_mgm_call)

fix the following valgrind warning when running ndb_mgm -e show (leak only in client)

==20398== 14,596 (11,936 direct, 2,660 indirect) bytes in 4 blocks are definitely lost in loss record 24 of 25
==20398==    at 0x401C4A1: malloc (vg_replace_malloc.c:149)
==20398==    by 0x80797A3: ConfigValuesFactory::create(unsigned, unsigned) (ConfigValues.cpp:309)
==20398==    by 0x8079F03: ConfigValuesFactory::expand(unsigned, unsigned) (ConfigValues.cpp:325)
==20398==    by 0x8079967: ConfigValuesFactory::put(ConfigValues::Entry const&) (ConfigValues.cpp:414)
==20398==    by 0x807A7B6: ConfigValuesFactory::unpack(void const*, unsigned) (ConfigValues.cpp:701)
==20398==    by 0x806CB9D: ConfigValuesFactory::unpack(UtilBuffer const&) (ConfigValues.hpp:252)
==20398==    by 0x8069160: ndb_mgm_get_configuration (mgmapi.cpp:1941)
==20398==    by 0x8060661: CommandInterpreter::executeShow(char*) (CommandInterpreter.cpp:1242)
==20398==    by 0x8063966: CommandInterpreter::execute_impl(char const*) (CommandInterpreter.cpp:715)
==20398==    by 0x8064040: CommandInterpreter::execute(char const*, int, int*) (CommandInterpreter.cpp:625)
==20398==    by 0x8064189: Ndb_mgmclient::execute(char const*, int, int*) (CommandInterpreter.cpp:203)
==20398==    by 0x805E56C: read_and_execute(int) (main.cpp:124)
==20398==    by 0x805E754: main (main.cpp:162)
==20398==


ndb/src/mgmclient/CommandInterpreter.cpp:
  correctly free (destroy) the configuration fetched for show

into  mysql.com:/home/hf/work/mysql-5.0.20910

into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0

into  xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


sql/share/errmsg.txt:
  Auto merged

into  mysql.com:/usr/home/ram/work/mysql-5.0


mysql-test/t/ctype_utf8.test:
  Auto merged
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
  Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
  Auto merged
mysql-test/r/ctype_utf8.result:
  SCCS merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/home/hf/work/mysql-5.0.20910


mysql-test/r/grant.result:
  Auto merged

Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

  init ndb_cache_check_time and honor value in my.cnf


sql/ha_ndbcluster.cc:
  init ndb_cache_check_time and honor value in my.cnf

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Merge
sql/ha_ndbcluster.cc:
  Merge
sql/ha_ndbcluster.h:
  Merge

  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);


mysql-test/r/ndb_lock.result:
  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
mysql-test/t/ndb_lock.test:
  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ndb/include/ndbapi/NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
sql/ha_ndbcluster.cc:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
sql/ha_ndbcluster.h:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge


strings/ctype-win1250ch.c:
  Coding style fix

into  xiphis.org:/home/antony/work2/mysql-5.0-merge


mysql-test/r/create.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb