mysql-test/t/type_newdecimal.test:
  these lines work differently in ps-protocol mode so should always work in
  normal here

into mysql.com:/home/hf/work/mysql-5.0.10004

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

into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998

   DEFAULT_COLLTION_NAME field is added to SCHEMATA table


mysql-test/r/information_schema.result:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
sql/sql_show.cc:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations

strings/decimal.c:
  Auto merged

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

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


include/my_global.h:
  Auto merged
BitKeeper/etc/logging_ok:
  auto-union
sql/share/charsets/Index.xml:
  Auto merged

Adding cp1250_croatian_ci collation.

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  old code didn't work when both decimals had zero before the decimal point

mysql-test/r/select.result:
  Added test cases for bugs 9799, 9800 and 9820
mysql-test/t/select.test:
  Added test cases for bugs 9799, 9800 and 9820

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/my_decimal.cc:
  error message fixed
strings/decimal.c:
  do_add function fixed

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/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union
include/violite.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged

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 ibmlab.site:/home/my/bk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union

into hundin.mysql.fi:/home/jan/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

into hundin.mysql.fi:/home/jan/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

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.

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

innobase/include/srv0srv.h:
  Restore accidentally deleted comment.

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.

strings/decimal.c:
  A fix (bug #10404: select 0/0 returns 0).
  We should check the second argument (0?) first.

into mysql.com:/root/mysql-5.0

into mysql.com:/root/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union

into mysql.com:/home/dlenev/src/mysql-5.0-bg9841


mysql-test/r/sp.result:
  Auto merged

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


sql/ha_innodb.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-have_cp932.inc:
  Delete: mysql-test/include/have_cp932.inc
BitKeeper/deleted/.del-ctype_cp932.result:
  Delete: mysql-test/r/ctype_cp932.result
BitKeeper/deleted/.del-have_cp932.require:
  Delete: mysql-test/r/have_cp932.require
BitKeeper/deleted/.del-ctype_cp932.test:
  Delete: mysql-test/t/ctype_cp932.test
BitKeeper/deleted/.del-ctype-cp932.c:
  Delete: strings/ctype-cp932.c
include/m_ctype.h:
  Auto merged
mysys/charset-def.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

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

into mysql.com:/root/mysql-5.0


sql/sql_select.cc:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union