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


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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


mysql-test/t/mysqltest.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/mysqltest.c:
  Manual merge
sql/hostname.cc:
  Manual merge

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

config/ac-macros/ha_federated.m4:
   Fixed typo

into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0

into mysql.com:/Users/eric/bktmp/mysql-5.0

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

client/mysqltest.c:
  Backport from 5.0
mysql-test/t/mysqltest.test:
  Remove the extra ;

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

into mysql.com:/Users/eric/bktmp/mysql-4.1


sql/sql_parse.cc:
  Auto merged

into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0


sql/mysqld.cc:
  Auto merged

into mysql.com:/Users/eric/bktmp/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0


configure.in:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug12953

OPTIMIZE TABLE statement is forbidden from usage in stored procedures/functions.

NOTE: OPTIMIZE TABLE statement can be useful in stored procedures. The idea is
that the user/administrator can create a stored procedure for admin
tasks (optimizing, backing up, etc). This procedure can be scheduled to run
automatically (by mean of internal cron (WL#1034)). So, once we can make this
statement work, it is worth doing it.


mysql-test/r/sp-error.result:
  Results for the test case for Bug#12953 added.
mysql-test/t/sp-error.test:
  Test case for Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function" added.
sql/sql_yacc.yy:
  Forbid "OPTIMIZE TABLE" statement from use in stored procedures/functions.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

insensitively with boolean options. Added a warning if given
value is invalid and skips the option handling in that case.

 - Workaround


extra/yassl/mySTL/helpers.hpp:
  Workaround for QNX
extra/yassl/mySTL/list.hpp:
  Use workaround for placement new
extra/yassl/taocrypt/src/misc.cpp:
  Don't include <new>

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


client/mysqltest.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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

into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

 - Common error handling regardless of --ps-protocol or not.


client/mysqltest.c:
  Merge normal_handle_error and run_query_stmt_handle_error to get consistent functionality and error messages regardless if --ps-protocol is used or not
  Call handle_error when error occured to check for expected error codes/states
  Call handle_no_error when no error ahs occured to check if an error was expected

  Argument of RAND function can be constant value only

mysql-test/include/have_lowercase0.inc:
  Remove extra ; at end of command(causing it to be skipped)
mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/mysqltest.test:
  Add test to detect "comment with command" with extra ; delimiter
  Fix extra ; delimiter

  after merge fix


sql/mysqld.cc:
  after merge fix

into  mysql.com:/usr/home/bar/mysql-5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  after merge fix

into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
configure.in:
  merge
mysql-test/r/fulltext_var.result:
  merge
sql/mysqld.cc:
  merge
sql/set_var.cc:
  merge

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


client/mysqltest.c:
  Auto merged
storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

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


client/mysqltest.c:
  Auto merged

into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.0

sql/mysql_priv.h:
  initialisation moved to mysqld.cc
sql/mysqld.cc:
  initialisation moved to mysqld.cc
sql/sql_cache.cc:
  support of concurent query cache resizing:
        - resizing made atomic
        - check stack size after each quard mutex lock
sql/sql_cache.h:
  initialisation moved to mysqld.cc
  removed uneed parameter (now it is always under guard mutex protection or called from destruction)

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

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

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


mysql-test/t/mysqltest.test:
  Auto merged

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


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/include/util/ndb_opts.h:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged

 - Update test cases


mysql-test/t/mysqltest.test:
  Uncomment the mysqltest -x test. Can't get the output to end up in the result file.

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

Makefile.am:
  Auto merged
BitKeeper/etc/config:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/include/page0page.ic:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
sql/log_event.cc:
  SCCS merged
sql/sql_prepare.cc:
  SCCS merged
sql/share/errmsg.txt:
  merge