into mysql.com:/home/mysqldev/tulin/mysql-5.0

BitKeeper/etc/logging_ok:
  auto-union
sql/sql_yacc.yy:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

    corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows


mysql-test/r/ndb_basic.result:
  added test to trigger drifferent fragmentations in ndb
mysql-test/t/ndb_basic.test:
  added test to trigger drifferent fragmentations in ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  corrected documentation on fragmentation
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  set "fragmentation medium" to mean 2 fragments per node instead of 1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  set default fragmentation to small instead of medium
sql/ha_ndbcluster.cc:
  bug#8284 adjust fragmentation to max_rows

into mysql.com:/home/mysql_src/mysql-5.0-clean

Proposal to fix this problem: when using libmysqlclient, you must call mysql_server_end() to nicely free memory at the end of your program; it however
sounds weird to call a function named *SERVER_end* when you're the CLIENT (you're not ending the server, you're ending your ability to talk to servers).
So here I add two defines which should be more generic names. This was longly discussed with Konstantin, Serg, Brian. The problem started from
a post on valgrind-users list: http://sourceforge.net/mailarchive/forum.php?thread_id=5778035&forum_id=32038 ; our manual mentions these functions
only for libmysqld API so needs some fixing, and then we can close BUG#8099 and BUG#6149.


include/mysql.h:
  Creating synonyms (defines): mysql_library_init for mysql_server_init, mysql_library_end for mysql_server_end;
  these new names are more generic, so suitable when using libmysqlclient as well as libmysqld.c

into mysql.com:/usr/home/ram/work/4.1


BitKeeper/etc/logging_ok:
  auto-union

mysql-test/r/type_float.result.es:
  Updated.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/timka/mysql/src/4.1-virgin

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

mysql-test/r/type_ranges.result.es:
  Updated.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into mysql.com:/home/timka/mysql/src/4.1-bug-8023

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


BitKeeper/etc/logging_ok:
  auto-union

mysql-test/r/type_float.result.es:
  Updated.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  auto-union
sql/item_func.cc:
  Auto merged
ndb/src/common/util/NdbSqlUtil.cpp:
  merge

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug6726

  Fix and test for parse bug


mysql-test/r/func_test.result:
  Bug#6726
    Test for parse bug
mysql-test/t/func_test.test:
  Bug#6726
    Test for parse bug
sql/sql_yacc.yy:
  Bug#6726
    Parser was confused by NOT in lookahead

ndb/src/common/util/NdbSqlUtil.cpp:
  sol9x86: cc -xO3: fix optimizer error.
  Note: same expression remains in Field_newdate::val_int().

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057


sql/item_func.cc:
  Auto merged

  Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,


mysql-test/r/update.result:
  Bug#8057
    Test for bug
mysql-test/t/update.test:
  Bug#8057
    Test for bug
sql/item_func.cc:
  Bug#8057
    Don't create new Item in val_int()

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

  new file

into mysql.com:/home/mysql_src/mysql-5.0-clean

mysql-test/r/rpl_change_master.result:
  result update after WL#1062 and merge
mysql-test/r/rpl_until.result:
  result update after WL#1062 and merge

into orca.ndb.mysql.com:/export/home/mikael/mysql-5.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Let --start-and-exit actually start a server
  Added that test case names can be specified on the comman line
  Added embedded server support
  Added environment variables UMASK, UMASK_DIR
  Added missing MASTER_MYSOCK1, MASTER_MYPORT1, USE_RUNNING_SERVER
  Added missing CHARSETSDIR, MYSQL_FIX_SYSTEM_TABLES, MYSQL_CLIENT_TEST
  Pass on return value from sleep_until_file_created(), to fail test
  Fail test if early termination of mysqld servers
  Create intial databases for the second master, and two additional slaves
mtr_process.pl:
  Find out if port is still in use, using simple TCP connect
  Use non blocking waitpid() to catch terminations early
  Make a special case spawning the 'mysqltest' application
  Redo the fork() if it returns EAGAIN
  Make sure to record if master or slave terminated
  Improved debugging output
  Improved code that remove PID files to avoid race
  Abort if we can't stop all mysqld servers using our ports
  Many improvements in killing mysqld servers
  Let sleep_until_file_created() catch if server died early
mtr_report.pl:
  Added option to disable test cases using <testcase>.disabled file
  If --timer, only try to open file with time data if it exists
mtr_io.pl:
  Remove starting/ending space reading server options from file


mysql-test/lib/mtr_io.pl:
  Remove starting/ending space reading server options from file
mysql-test/lib/mtr_report.pl:
  Added option to disable test cases using <testcase>.disabled file
  If --timer, only try to open file with time data if it exists
mysql-test/lib/mtr_process.pl:
  Find out if port is still in use, using simple TCP connect
  Use non blocking waitpid() to catch terminations early
  Make a special case spawning the 'mysqltest' application
  Redo the fork() if it returns EAGAIN
  Make sure to record if master or slave terminated
  Improved debugging output
  Improved code that remove PID files to avoid race
  Abort if we can't stop all mysqld servers using our ports
  Many improvements in killing mysqld servers
  Let sleep_until_file_created() catch if server died early
mysql-test/mysql-test-run.pl:
  Let --start-and-exit actually start a server
  Added that test case names can be specified on the comman line
  Added embedded server support
  Added environment variables UMASK, UMASK_DIR
  Added missing MASTER_MYSOCK1, MASTER_MYPORT1, USE_RUNNING_SERVER
  Added missing CHARSETSDIR, MYSQL_FIX_SYSTEM_TABLES, MYSQL_CLIENT_TEST
  Pass on return value from sleep_until_file_created(), to fail test
  Fail test if early termination of mysqld servers
  Create intial databases for the second master, and two additional slaves

into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged

into mysql.com:/Users/mikron/mysql-4.1

into mysql.com:/Users/mikron/mysql-5.0


ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged

into mysql.com:/home/mysqldev/tulin/mysql-5.0

support-files/ndb-config-2-node.ini.sh:
  Rename: support-files/ndb-config-2-node.ini -> support-files/ndb-config-2-node.ini.sh

into mysql.com:/home/mysqldev/tulin/mysql-5.0


support-files/mysql.spec.sh:
  Auto merged

configure.in:
  Auto merged
include/my_global.h:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
ndb/test/ndbapi/flexBench.cpp:
  Auto merged
ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
ndb/test/ndbapi/flexTT.cpp:
  Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  corrected automerge error

sql/item.cc:
  After merge fixes (bug during merge)
sql/sql_show.cc:
  Ensure that lex->all_select_list is properly reset on function end
  (Caused crashes after merge)