BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/share/Makefile.am:
  Auto merged
libmysql/libmysql.c:
  Merge from 4.0

libmysql/libmysql.c:
  Backport fix for escaping multibyte characters from 4.1

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/create.result:
  Auto merged

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Fix bug by moving TRUE/FALSE in with other literals.


mysql-test/r/create.result:
  Test for Bug#9666
mysql-test/t/create.test:
  Test for Bug#9666
sql/sql_yacc.yy:
  Move TRUE/FALSE in with other literals.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.


mysql-test/r/insert_update.result:
  Test for Bug#9725
mysql-test/t/insert_update.test:
  Test for Bug#9725
sql/sql_insert.cc:
  Ignore the failure in update_row when IGNORE is set.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/space/my/mysql-4.0

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

when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.


configure.in:
  Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )
sql/share/Makefile.am:
  using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
  all-local is the standard way to :
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/space/pekka/ndb/version/my41

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  same number of lh3distrbits for all frags

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


client/mysql.cc:
  Auto merged

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

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


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

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

into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged

BUILD/compile-dist:
  - typo fix

into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged

- added some required CXXFLAGS to BUILD/compile-dist to allow the distribution build to pass without
  unresolved symbols


BUILD/compile-dist:
  - added some required CXXFLAGS to allow the distribution build to pass

into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1


BitKeeper/etc/logging_ok:
  auto-union

into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_base.cc:
  Auto merged

Adding cp1250_croatian_ci collation.

  MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
  Infinite loop caused by missing update to thd version.


sql/sql_base.cc:
  Bug#6616
    thd version needs to be updated before reopening tables
    to prevent an infinite loop.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

latin2_croatian_ci collation was fixed.

into bk-internal.mysql.com:/users/rburnett/bug10245


BitKeeper/etc/logging_ok:
  auto-union

into bk-internal.mysql.com:/users/rburnett/bug9721


BitKeeper/etc/logging_ok:
  auto-union

viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts


vio/viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts

include/my_global.h:
  A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).
  We don't need to manipulate HAVE_ATOMIC_XXX here as we test it in the configure.

into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb

into ibmlab.site:/home/my/bk/mysql-4.1

upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.

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

Invalid DataDir in config causes ndbd segfault


ndb/src/kernel/error/ErrorReporter.cpp:
  print error and return error if unable to open the file for error reporting.

into hundin.mysql.fi:/home/marko/mysql-4.1


sql/ha_innodb.cc:
  Auto merged

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql


BitKeeper/etc/logging_ok:
  auto-union