sql/sp_head.cc:
  Post-review fix.
sql/sp_head.h:
  Post-review fix.
sql/sql_yacc.yy:
  Post-review fix.

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0

into  mysql.com:/opt/local/work/mysql-5.0-root

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0

ndb/src/mgmsrv/main.cpp:
  fix --no-defaults option processing

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/ndb/ndbcluster.sh:
  Auto merged

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

mysql-test/ndb/ndbcluster.sh:
  small fix to make ndb_mgmd run
ndb/tools/ndb_size.pl:
  small typo

into  mysql.com:/opt/local/work/mysql-5.0-root


sql/protocol.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge.

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0


mysql-test/r/sp-error.result:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

support-files/MySQL-shared-compat.spec.sh:
  Prevent "libndbclient" (which is not included in the "shared compat" RPM)
  from breaking the RPM packaging.
  
  Also, adapt the specification to the newer versions of the older release families.
  This needs to be repeated periodically.
  Take care of the RPM build version: For 4.1.16, it is 4.1.16-1 !

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

 mysql_stmt_prepare returns wrong field length"


sql/protocol.cc:
  A fix for Bug#15613: make sure that result set column length
  is evaluated correctly for BLOB/TEXT columns.
tests/mysql_client_test.c:
  A test case for Bug#15613

into  mysql.com:/opt/local/work/mysql-5.0-root

into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0

into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0


sql/sql_acl.cc:
  Auto merged

 Make innodb_thread_concurrency 0 by default, and extend the usable
 range from 0 to 1000 (0 disables the thread throttling).


innobase/include/srv0srv.h:
  Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
innobase/srv/srv0srv.c:
  Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
mysql-test/r/innodb.result:
  innodb_thread_concurrency is 0..1000 now, and the default is 0.
mysql-test/t/innodb.test:
  innodb_thread_concurrency is 0..1000 now.
sql/ha_innodb.cc:
  Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
sql/mysqld.cc:
  innodb_thread_concurrency is 0..1000 now, and 0 (the default)
   disables the thread throttling.

into  mysql.com:/opt/local/work/mysql-5.0-root


BitKeeper/etc/ignore:
  auto-union
libmysql/Makefile.shared:
  Auto merged
configure.in:
  Manual merge.
libmysql/libmysql.c:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

 Make innodb_flush_log_at_trx_commit a settable global variable.


innobase/include/srv0srv.h:
  Change the type of srv_flush_log_at_trx_commit.
innobase/srv/srv0srv.c:
  Change the type of srv_flush_log_at_trx_commit.
sql/ha_innodb.cc:
  Remove innobase_flush_log_at_trx_commit.
   (Set srv_flush_log_at_trx_commit directly).
sql/ha_innodb.h:
  Remove innobase_flush_log_at_trx_commit.
   (Set srv_flush_log_at_trx_commit directly).
sql/mysqld.cc:
  Bypass the variable innobase innobase_flush_log_at_trx_commit.
sql/set_var.cc:
  Make innodb_flush_log_at_trx_commit a settable global variable.

into mysql.com:/M50/merge-5.0

into mysql.com:/M50/merge-5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

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

into  devsrv-b.mysql.com:/space/magnus/my41-bug14634

use the right type in mysql_stmt_attr_get


libmysql/libmysql.c:
  Fix Bug#16144 "mysql_stmt_attr_get type error"
tests/mysql_client_test.c:
  A test case for Bug#16144

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

into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1


configure.in:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  devsrv-b.mysql.com:/space/magnus/my41-bug14634


sql/sql_select.cc:
  Auto merged

reword the misleading message.


mysql-test/r/sp-error.result:
  Test results fixed (Bug#15206)
mysql-test/r/sp.result:
  Test results fixed (Bug#15206)
mysql-test/r/type_decimal.result:
  Disable an unportable test case (Bug#7670)
mysql-test/r/variables.result:
  Test results fixed (Bug#15206)
mysql-test/r/view_grant.result:
  Test results fixed (Bug#15206)
mysql-test/t/type_decimal.test:
  Remove an unportable (QNX) test case (Bug#7670). The test output
  depends on system-specific sprintf() implementation.
  The original complain was about erroneous conversion to long long,
  which was applied prior to conversion to double: but the expected
  behaviour can't be achieved until we have an own string -> double
  conversion function.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

client/mysqltest.c:
  If connection suceeded don't close it, just call handle_no_error which will check if an error was expected
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Add test for connection not being added to connection pool if "disable_abort_on_error" was used

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


sql/sql_handler.cc:
  Auto merged

sql/sql_select.cc:
  Backport from 5.0, catch the new errno that is returned

libmysqlclient versioning when linked with GNU ld.


BitKeeper/etc/ignore:
  Added libmysql/libmysql.ver to the ignore list
configure.in:
  libmysqlclient versioning when linked with GNU ld.
libmysql/Makefile.shared:
  libmysqlclient versioning when linked with GNU ld.
libmysql/libmysql.ver.in:
  New BitKeeper file ``libmysql/libmysql.ver.in''

into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0