into narttu.mysql.fi:/my/mysql-4.0


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Tests cleanup (put drop database first in tests)


client/mysql.cc:
  Cleanup of code in last pull
include/config-win.h:
  Remove HAVE_CHSIZE on windows as it's not 64 bit clean
include/my_global.h:
  Portability fix
mysql-test/r/drop.result:
  Clean up results
mysql-test/r/flush.result:
  Clean up results
mysql-test/r/grant_cache.result:
  Clean up results
mysql-test/r/innodb.result:
  Clean up results
mysql-test/r/insert_select.result:
  Clean up results
mysql-test/r/merge.result:
  Clean up results
mysql-test/r/query_cache.result:
  Clean up results
mysql-test/t/drop.test:
  Clean up tests
mysql-test/t/flush.test:
  Clean up tests
mysql-test/t/grant_cache.test:
  Clean up tests
mysql-test/t/innodb.test:
  Clean up tests
mysql-test/t/insert_select.test:
  Added more tests
mysql-test/t/merge.test:
  Test of bug 515
mysql-test/t/query_cache.test:
  Clean up tests
mysql-test/t/symlink.test:
  Clean up tests
sql/mysql_priv.h:
  Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_lex.h:
  Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_list.h:
  Indentation cleanup
sql/sql_parse.cc:
  Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_yacc.yy:
  Cleaner implementation if INSERT ... SELECT with same tables

  Remove outdated comment and the corresponding assertion in debug version code


innobase/lock/lock0lock.c:
  Remove outdated comment and the corresponding assertion in debug version code

so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.


mysql-test/r/rpl_log.result:
  Result update
mysql-test/r/rpl_log_pos.result:
  Result update
sql/mysqld.cc:
  Don't start replication if in bootstrap mode (bootstrap isn't supposed to have
  several threads).
sql/slave.cc:
  Fix for bug 763 (Relay_log_space too big by 4 bytes).
  A DBUG_PRINT.
sql/sql_acl.cc:
  Replaced a return by DBUG_RETURN (happened to find this reading a debug log).
sql/sql_repl.cc:
  A comment.

(Needed for platforms with the traditional bzero prototype.)
Fixes BUG#460.

  Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates


mysql-test/t/innodb.test:
  Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates
mysql-test/r/innodb.result:
  Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

client/mysqlbinlog.cc:
  changed format of eof-packet for protocol 4.1

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

CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;

  Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)


mysql-test/r/innodb.result:
  Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)
mysql-test/t/innodb.test:
  Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)

  Make execution with UNIV_SYNC_DEBUG faster


innobase/sync/sync0sync.c:
  Make execution with UNIV_SYNC_DEBUG faster

into narttu.mysql.fi:/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged

  Fix a latching order violation in the previous (2003-06-15) push: could lead to a hang on the btr0sea.c semaphore


innobase/lock/lock0lock.c:
  Fix a latching order violation in the previous (2003-06-15) push: could lead to a hang on the btr0sea.c semaphore

  Cleanup


sql/ha_innodb.cc:
  Cleanup

  Remove still some potential hangs over the btr0sea.c semaphore


sql/ha_innodb.cc:
  Remove still some potential hangs over the btr0sea.c semaphore

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

mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

include/my_global.h:
  CONFIG_SMP
mysql-test/r/grant.result:
  Test cases for bug fixes
mysql-test/r/insert_select.result:
  Test cases for bug fixes
mysql-test/r/union.result:
  Test cases for bug fixes
mysql-test/t/grant.test:
  Test cases for bug fixes
mysql-test/t/insert_select.test:
  Test cases for bug fixes
mysql-test/t/union.test:
  Test cases for bug fixes
sql/sql_acl.cc:
  Fix for granting global privileges on db level
sql/sql_parse.cc:
  Fix for INSERT... SELECT
sql/sql_select.cc:
  removing a fix
sql/sql_union.cc:
  P

into hundin.mysql.fi:/home/heikki/mysql-4.0

  Fix a possible hang over the btr0sea.c latch


sql/ha_innodb.cc:
  Fix a possible hang over the btr0sea.c latch

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

into mashka.mysql.fi:/home/my/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_671/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged

client/mysqlbinlog.cc:
  removed --table option

BitKeeper/etc/logging_ok:
  auto-union
sql/item_func.cc:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/nt_servc.cc:
  Auto merged
configure.in:
  Use local version
innobase/os/os0file.c:
  Use local version
innobase/page/page0page.c:
  Use local version
innobase/row/row0sel.c:
  Use local version
innobase/row/row0vers.c:
  Use local version
mysql-test/r/order_by.result:
  Use local version
mysql-test/r/user_var.result:
  merge with 3.23
mysql-test/t/order_by.test:
  Use local version (test is already in range.test)
sql/log.cc:
  Use local version
sql/share/spanish/errmsg.txt:
  merge
sql/slave.cc:
  Use local version
sql/sql_class.h:
  Use local version
sql/sql_select.cc:
  Use patch in 4.0 for range with NULL problem

Don't set field to DEFAULT value when set to NULL


mysql-test/r/insert.result:
  Updated results after patch
sql/field_conv.cc:
  Revert patch: Don't set field to DEFAULT value when set to NULL
sql/item_strfunc.cc:
  Optimized patch for null handling with elt
sql/opt_range.cc:
  Safety fix for range with null patch

into mashka.mysql.fi:/home/my/mysql-4.0


sql/item_strfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/insert_select.result:
  Fixed results
mysql-test/r/join_outer.result:
  New test case for inner join table dependency
mysql-test/t/insert_select.test:
  Remove not used drop tables.
  Fixed table names
mysql-test/t/join_outer.test:
  New test case for inner join table dependency
sql/slave.cc:
  Simple optimizations

into mashka.mysql.fi:/home/my/mysql-3.23

  CREATE TABLE ...(SELECT ...) UNION ...
  INSERT ...      (SELECT ...) UNION ...