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


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged

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

into mysql.com:/usr/home/bar/mysql-4.1

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

ndb/include/kernel/Interpreter.hpp:
  R1 defined on some platforms
ndb/include/util/BaseString.hpp:
  fix for compiler bug

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

  Serg's typo fix :)


sql/field.cc:
  Serg's typo fix :)

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

strings/my_vsnprintf.c:
  %.#s support in my_vsnprintf
BitKeeper/etc/ignore:
  Added EXCEPTIONS-CLIENT to the ignore list

into mysql.com:/home/mysql_src/mysql-4.1-874

as this enum is not really usable yet (as MySQL server supports only one
shutdown level), and as SHUTDOWN_DEFAULT is still left to 0, this change
should disturb no user. Later (in 4.1.4 or 4.1.5) code will be pushed to
implement graceful shutdown using this enum.


VC++Files/winmysqladmin/mysql_com.h:
  changing the values in the enumeration enum_shutdown_level.
include/mysql_com.h:
  changing the values in the enum enum_shutdown_level.
  The main one, SHUTDOWN_DEFAULT, is unchanged.

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  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/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/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/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/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

SELECT ... UNION and INSERT ... SELECT ... UNION

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

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

  LIKE crashed mysqld for binary collations in some cases


mysql-test/r/func_like.result:
  LIKE crashed mysqld for binary collations in some cases

  LIKE crashed mysqld for binary collations in some cases


strings/ctype-big5.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-euc_kr.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-gb2312.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-gbk.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-latin1.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-sjis.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-tis620.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-ucs2.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-ujis.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-utf8.c:
  LIKE crashed mysqld for binary collations in some cases
sql/item_cmpfunc.cc:
  LIKE crashed mysqld for binary collations in some cases

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

  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) 


sql/ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
sql/mysqld.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/include/srv0start.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/include/ut0dbg.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0dbg.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0mem.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/srv/srv0start.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)

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

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


ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

into mysql.com:/dbdata/psergey/mysql-4.1-root

bug#4925

(old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

This fixes problem with auto increment on different byte order

(This also make adding of signed ints really simple...)


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/Ndb.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/NdbOperationInt.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

into mysql.com:/home/mysql_src/mysql-4.1-874

into mysql.com:/home/mysql_src/mysql-4.0

(specific to 4.1): don't put CLIENT_LOCAL_FILES in
CLIENT_CAPABILITIES; it would make mysql_options(CLIENT_LOCAL_FILES,0)
have no effect.


libmysql/client_settings.h:
  Don't enforce that we client have CLIENT_LOCAL_FILES;
  indeed this CLIENT_CAPABILITIES is used as minimum
  client options in mysql_real_connect(), which is *after*
  mysql_options(). Having CLIENT_LOCAL_FILES in
  CLIENT_CAPABILITIES defeats disabling it in mysql_options().

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

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