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


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged

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

ndb/test/ndbapi/bench/mainPopulate.cpp:
  return correct
ndb/test/ndbapi/bench/userInterface.cpp:
  remove NA setting
ndb/test/run-test/daily-devel-tests.txt:
  set correct args

Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks...


VC++Files/tests/mysql_client_test.dsp:
  fix request by Kent
sql/item.cc:
  fix requested by kent

BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Merge changes

into mysql.com:/home/jimw/my/mysql-4.0-clean

binlog-do-db or binlog-ignore-db are in effect.   (In the future 5.1? 5.0? I think 
each statement should be verified against the filtering criteria based on the database
it *uses* and not the *current* one.  But, right now the *current* database is what 
counts according to the semantics of the manual.)


sql/log.cc:
  BUG#6749: If there is no current database, then nothing should be binlogged if
  binlog-do-db or binlog-ignore-db are in effect.   (In the future I think that each 
  statement should be verified against the filtering criteria based on the database
  it *uses* and not the *current* one.  But, right now the *current* database is what 
  counts according to the semantics of the manual.)

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


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged

ndb/test/run-test/daily-basic-tests.txt:
  run mysql-test-run for max 1 hour
    (normally 30 minutes)
ndb/test/run-test/daily-devel-tests.txt:
  Add benchmark to devel suite
ndb/test/run-test/main.cpp:
  Add bench mode. always produce report
ndb/test/run-test/run-test.hpp:
  Add bench mode. always produce report

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

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


sql/sql_parse.cc:
  Auto merged

ndb/test/ndbapi/bench/userInterface.h:
  adapt to changes in ndbapi

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

into mysql.com:/home/kostja/work/mysql-5.0-root


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

libmysql/libmysql.c:
  And now put it to the proper place and make it work (Bug#7990)
tests/mysql_client_test.c:
  Enable the test for bug#7990

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

into mysql.com:/home/kostja/work/mysql-5.0-root


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

reset mysql->net.last_error": the solution is to clear
MYSQL->net error before performing COM_CLOSE: if the call
succeeds, the connection is usable for other statements.
More comprehensive fix is to clear MYSQL->net for all
recoverable errors at the time they happen, it will be
implemented in 5.0 as it introduces incompatibility in behavior.


libmysql/libmysql.c:
  A simple fix for Bug#7990 "mysql_stmt_close doesn't reset 
  mysql->net.last_error"
tests/mysql_client_test.c:
  A test case for Bug#7990 " mysql_stmt_close doesn't reset 
  mysql->net.last_error"

libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged

After merge fixes
Don't give duplicate warnings for some ::store() functions


mysql-test/mysql-test-run.sh:
  Added back missing line
mysql-test/r/ps_2myisam.result:
  Update results after removing duplicate warnings from ::store()
mysql-test/r/ps_3innodb.result:
  Update results after removing duplicate warnings from ::store()
mysql-test/r/ps_4heap.result:
  Update results after removing duplicate warnings from ::store()
mysql-test/r/ps_5merge.result:
  Update results after removing duplicate warnings from ::store()
sql/field.cc:
  Don't give duplicate warnings for some ::store() functions
  Before we could get different number of warnings in the test suite for different platforms
sql/field.h:
  Update results after removing duplicate warnings from ::store()
sql/sql_class.h:
  Update results after removing duplicate warnings from ::store()
sql/sql_error.cc:
  Update results after removing duplicate warnings from ::store()
sql/sql_list.h:
  After merge fix

mysql-test/mysql-test-run.sh:
  Use local var for the individulisation of tracefile name

into mysql.com:/home/my/mysql-5.0

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


sql/sql_parse.cc:
  Auto merged

libmysql/libmysql.c:
  Fix for bug#8330 "mysql_stmt_execute crashes": we need to bail out
  from mysql_stmt_execute if mysql->net is occupied with a result set of
  another statement. Otherwise on the next attempt to use net we get
  a crash, as it's freed in case of error.
tests/mysql_client_test.c:
  A test case for Bug#8330 "mysql_stmt_execute craches" (libmysql)

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

sql/sql_parse.cc:
  Added missing #ifdef HAVE_INNOBASE_DB:s.

ndb/test/ndbapi/Makefile.am:
  Reenable old benchmark

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

into mysql.com:/home/jimw/my/mysql-4.1-clean

BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
netware/BUILD/nwbootstrap:
  merge: keep local
scripts/make_binary_distribution.sh:
  merge: keep local
sql/ha_heap.cc:
  Trivial merge
sql/ha_innodb.cc:
  Auto merge (Code already existed in 5.0)
sql/item_cmpfunc.cc:
  Simple merge
sql/item_func.cc:
  Simple merge
sql/item_row.cc:
  Simple merge
sql/item_strfunc.cc:
  Simple merge
sql/item_subselect.cc:
  Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed

into mysql.com:/home/my/mysql-5.0


sql/mysqld.cc:
  Auto merged

This removes a (small) memory leak.


sql/nt_servc.h:
  Indentation change

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/item_cmpfunc.cc:
  Auto merged

zlib)


config/ac-macros/zlib.m4:
  Fix bad 4.1->5.0 merge

into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged