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 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

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

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.

a stored procedure" (version 2).

To handle updates and inserts into view in SP properly we should set
lock types for tables of the view's main select when we are opening
view for prelocking purproses.


mysql-test/r/sp.result:
  Added test case for bug #9841 "Unexpected read lock when trying to update
  a view in a stored procedure"
mysql-test/t/sp.test:
  Added test case for bug #9841 "Unexpected read lock when trying to update
  a view in a stored procedure"
sql/sql_view.cc:
  mysql_make_view():
    To handle updates and inserts into view in SP properly we should set
    lock types for tables of the view's main select when we are opening
    view for prelocking purproses.
    Also it is more correct to use LEX::select_lex::get_table_list() 
    instead of 'view_tables' variable for obtaining list of those
    tables.

Only print the read line version if we are on a platform that supports readline

mysql.cc:
  Add #ifdef to only print readline version if we are on a platform that supports readline


client/mysql.cc:
  Add #ifdef to only print readline version if we are on a platform that supports readline
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout


vio/viosocket.c:
  Set the appropriate timeout in vio_timeout
sql/net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
include/violite.h:
  Add which parameter to vio_timeout sigs
vio/vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
vio/viossl.c:
  Add which parameter to ssl timeout routine
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted