into mishka.local:/home/my/mysql-5.0

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 mishka.local:/home/my/mysql-5.0


sql/ha_innodb.cc:
  Auto merged

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

sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

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.

Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema


client/client_priv.h:
  --count for mysqlshow
client/mysqlshow.c:
  Added option --count to be used when the user want's number of rows per table in the output
  (We shouldn't use count(*) as default as this can be a slow operation)
mysys/my_thr_init.c:
  Correct comment
sql/ha_berkeley.cc:
  Remove not used variable
sql/ha_berkeley.h:
  Remove not used variable
sql/ha_innodb.cc:
  Remove not used function
sql/ha_ndbcluster.cc:
  false -> FALSE
  true -> TRUE
sql/handler.cc:
  Added and fixed comments
  Remove 'strange' code to remove compiler warnings (better to do things like this with attribute)
sql/item.cc:
  false -> FALSE
sql/item_cmpfunc.cc:
  Fixed indentation
sql/item_cmpfunc.h:
  marked BETWEEN as a bool function
sql/item_func.cc:
  Simple optimzation
sql/key.cc:
  Removed wrong code
sql/log.cc:
  Check result from open_index_file()
sql/mysql_priv.h:
  Simplyfy some test of netware
sql/mysqld.cc:
  Fixed indentation
  Check result form open_index_file()
  Simplify code with IF_NETWARE()
sql/opt_range.cc:
  false -> FALSE
  true -> TRUE
  Fixed indentation
sql/opt_sum.cc:
  Fixed comments
sql/sp_head.cc:
  Simple optimzation
  Move variable declarations to begining of blocks
sql/sql_acl.cc:
  Fix long lines
  Rename xx -> column
  Move declaration to beginning of block
sql/sql_parse.cc:
  Removed comment
sql/sql_select.cc:
  Indentation fixes
sql/sql_show.cc:
  Fixed reference outside of array (possible core dump)
sql/sql_table.cc:
  Simplify code
  Combine common code
sql/sql_test.cc:
  false -> FALSE
sql/sql_trigger.cc:
  false -> false
  true -> TRUE
sql/sql_yacc.yy:
  Simpler test
sql/unireg.cc:
  Added comment

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

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

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

mysql-test/r/case.result:
  test result fixed
mysql-test/r/create.result:
  test result fixed
mysql-test/r/distinct.result:
  test result fixed
mysql-test/r/func_group.result:
  test result fixed
mysql-test/r/func_op.result:
  test result fixed
mysql-test/r/group_by.result:
  test result fixed
mysql-test/r/metadata.result:
  test result fixed
mysql-test/r/olap.result:
  test result fixed
mysql-test/r/ps_2myisam.result:
  test result fixed
mysql-test/r/ps_3innodb.result:
  test result fixed
mysql-test/r/ps_4heap.result:
  test result fixed
mysql-test/r/ps_5merge.result:
  test result fixed
mysql-test/r/ps_6bdb.result:
  test result fixed
mysql-test/r/ps_7ndb.result:
  test result fixed
mysql-test/r/select.result:
  test result fixed
mysql-test/r/sp.result:
  test result fixed
mysql-test/r/type_decimal.result:
  test result fixed
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/r/union.result:
  test result fixed
mysql-test/r/variables.result:
  test result fixed
mysql-test/t/func_group.test:
  test modified
mysql-test/t/olap.test:
  test modified
mysql-test/t/type_decimal.test:
  test modified

into mysql.com:/home/hf/work/mysql-5.0.prec

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


BitKeeper/etc/logging_ok:
  auto-union

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

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita

mysql-test/t/rpl_sp.test:
  making test hostname-independent (don't know why the problem didn't appear on my machine)
mysql-test/r/rpl_sp.result:
  result update

We cannot propagate constants with tricky collations.