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

into mysql.com:/space/pekka/ndb/version/my50-ndb


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bugfix: bad signal to ACC for ordered index

into mysql.com:/home/svoj/devel/mysql/stddev-mysql-5.0


sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/space/pekka/ndb/version/my50-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

  fix error code


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix error code

ndb/include/ndb_constants.h:
  consistent names
ndb/include/ndbapi/NdbDictionary.hpp:
  consistent names
ndb/include/util/NdbSqlUtil.hpp:
  consistent names
ndb/src/common/util/NdbSqlUtil.cpp:
  minor completion
ndb/src/ndbapi/NdbOperationInt.cpp:
  alignment fix

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into mysql.com:/home/my/mysql-5.0

Temporary patch to remove some warnings


sql/item.cc:
  Trivial optimization
sql/protocol.cc:
  Fixed spelling error
sql/sql_parse.cc:
  Fix to not get warnings during inital temp open (should be deleted after Dimitri's next push)
  Style fixes
sql/table.cc:
  Ensure that cleanup is done, even if we get an error

  Fix wrong spelling


innobase/include/trx0trx.h:
  Fix wrong spelling
innobase/trx/trx0trx.c:
  Fix wrong spelling

  Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging


innobase/trx/trx0roll.c:
  Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
innobase/trx/trx0trx.c:
  Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
innobase/trx/trx0undo.c:
  Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
innobase/include/trx0undo.h:
  Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging

This bug is also known as WL#1639.


mysql-test/r/func_group.result:
  Test case for stddev_pop, var_pop, stddev_samp, var_samp was added.
mysql-test/t/func_group.test:
  Test case for stddev_pop, var_pop, stddev_samp, var_samp was added.
sql/item_sum.cc:
  New functions stddev_samp and var_samp were added.
sql/item_sum.h:
  New functions stddev_samp and var_samp were added.
sql/lex.h:
  New functions stddev_pop, var_pop, stddev_samp and var_samp were added.
sql/sql_yacc.yy:
  New functions stddev_pop, var_pop, stddev_samp and var_samp were added.

into mysql.com:/home/my/mysql-5.0


sql/sp_pcontext.cc:
  Auto merged

mysql-test/r/sp.result:
  New test case for BUG#8757.
mysql-test/t/sp.test:
  New test case for BUG#8757.
sql/sp_pcontext.cc:
  Return the correct scope offset to cursors during parsing.

mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/examples/ha_archive.cc:
  Merge with global tree
  (Use my changes)
sql/sql_parse.cc:
  Remove 'tmp' fix to be able to run tests

(Found during build process)


extra/comp_err.c:
  Remove compiler warnings
extra/perror.c:
  Remove compiler warnings
innobase/dict/dict0dict.c:
  Remove compiler warnings
innobase/dict/dict0load.c:
  Remove compiler warnings
innobase/pars/pars0sym.c:
  Remove compiler warnings
innobase/row/row0row.c:
  Remove compiler warnings
innobase/row/row0sel.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Remove not used variables
myisam/mi_key.c:
  Remove compiler warnings
regex/engine.c:
  Added comment
sql/derror.cc:
  Remove not used variables
sql/examples/ha_archive.cc:
  Fixed bug in blob handling
  Removed not used variable
sql/field.cc:
  Remove compiler warnings
  Remove not used variables
sql/filesort.cc:
  Remove compiler warnings
sql/ha_heap.cc:
  Remove not used variable
sql/ha_innodb.cc:
  Remove not used variables
  Remove compiler warnings
sql/handler.cc:
  Remove compiler warnings and remove not used variables
sql/item.cc:
  Remove compiler warnings and remove not used variables
sql/item_subselect.cc:
  Remove compiler warnings
sql/item_sum.cc:
  Remove compiler warnings
sql/item_sum.h:
  Remove compiler warnings and remove not used variables
sql/log.cc:
  Remove compiler warnings and remove not used variables
sql/log_event.cc:
  Remove compiler warnings
sql/mysqld.cc:
  Remove compiler warnings and remove not used variables
sql/opt_range.cc:
  Remove compiler warnings and remove not used variables
sql/slave.cc:
  Remove compiler warnings and remove not used variables
sql/sp_pcontext.cc:
  Remove compiler warnings and remove not used variables
sql/sql_acl.cc:
  Remove compiler warnings and remove not used variables
sql/sql_analyse.cc:
  Remove compiler warnings and remove not used variables
sql/sql_base.cc:
  Remove compiler warnings and remove not used variables
sql/sql_db.cc:
  Remove compiler warnings and remove not used variables
sql/sql_help.cc:
  Remove compiler warnings and remove not used variables
sql/sql_insert.cc:
  Remove compiler warnings and remove not used variables
sql/sql_load.cc:
  Remove compiler warnings and remove not used variables
sql/sql_parse.cc:
  Remove compiler warnings and remove not used variables
sql/sql_prepare.cc:
  Remove compiler warnings and remove not used variables
sql/sql_select.cc:
  Remove compiler warnings and remove not used variables
sql/sql_show.cc:
  Remove compiler warnings and remove not used variables
sql/sql_table.cc:
  Remove compiler warnings
sql/sql_union.cc:
  Remove compiler warnings
sql/sql_update.cc:
  Remove compiler warnings and remove not used variables
sql/sql_yacc.yy:
  Remove compiler warnings and remove not used variables
sql/strfunc.cc:
  Remove compiler warnings and remove not used variables
strings/ctype-ucs2.c:
  Remove compiler warnings
tests/mysql_client_test.c:
  Remove compiler warnings and remove not used variables
tools/mysqlmanager.c:
  Remove compiler warnings and remove not used variables

  Another multi result statement added.
  Note: No test case, as it's not possible to get a deterministic result from this.


sql/sp_head.cc:
  Another multi result statement added: show mutex status.

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

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

  Have to thd->set_time() before each substatement execution, to make
  current_time() et al return different times within the same procedure.


mysql-test/r/sp.result:
  New test case for BUG#6857: current_time() in STORED PROCEDURES.
  Note: The actual call is disable, to save time when running with slow debugging tools.
mysql-test/t/sp.test:
  New test case for BUG#6857: current_time() in STORED PROCEDURES.
  Note: The actual call is disable, to save time when running with slow debugging tools.
sql/sp_head.cc:
  Make current_time() et all work in stored procedures.

into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/ignore:
  auto-union

BitKeeper/etc/ignore:
  added ndb/src/common/debugger/signaldata/libsignaldataprint.dsp ndb/src/common/debugger/libtrace.dsp ndb/src/common/logger/liblogger.dsp ndb/src/common/mgmcommon/libmgmsrvcommon.dsp ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp ndb/src/kernel/blocks/dbacc/libdbacc.dsp ndb/src/kernel/blocks/dbdict/libdbdict.dsp ndb/src/kernel/blocks/dbdih/libdbdih.dsp ndb/src/kernel/blocks/dblqh/libdblqh.dsp ndb/src/kernel/blocks/dbtc/libdbtc.dsp ndb/src/kernel/blocks/dbtup/libdbtup.dsp ndb/src/kernel/blocks/dbtux/libdbtux.dsp ndb/src/kernel/blocks/dbutil/libdbutil.dsp ndb/src/kernel/blocks/grep/libgrep.dsp ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp ndb/src/kernel/blocks/ndbfs/libndbfs.dsp ndb/src/kernel/blocks/qmgr/libqmgr.dsp ndb/src/kernel/blocks/suma/libsuma.dsp ndb/src/kernel/blocks/trix/libtrix.dsp ndb/src/kernel/error/liberror.dsp ndb/src/kernel/vm/libkernel.d
  sp ndb/src/kernel/ndbd.dsp ndb/src/mgmapi/libmgmapi.dsp ndb/src/mgmclient/ndb_mgm.dsp ndb/src/mgmclient/libndbmgmclient.dsp ndb/src/mgmsrv/ndb_mgmd.dsp ndb/src/ndbapi/libndbapi.dsp ndb/src/libndbclient.dsp ndb/test/ndbapi/flexBench.dsp ndb/test/ndbapi/testBasic.dsp ndb/test/ndbapi/testBlobs.dsp ndb/test/ndbapi/testScan.dsp ndb/test/src/libNDBT.dsp ndb/tools/ndb_waiter.dsp ndb/tools/ndb_drop_table.dsp ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_desc.dsp ndb/tools/ndb_drop_index.dsp ndb/tools/ndb_show_tables.dsp ndb/tools/ndb_select_all.dsp ndb/tools/ndb_select_count.dsp

sql/sql_parse.cc:
  Exclude

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

  More explicit naming of variables


ndb/include/kernel/signaldata/AlterIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/BuildIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateTrig.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/DropIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Set error/master node also on BuildIndxRef
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Use masterNodeId instead of errornode

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Previously we only stored the first given error (the error sent to the client)


include/mysys_err.h:
  Moved ER_FILENOTFOUND last to avoid getting 'error 0'
mysql-test/r/backup.result:
  More warnings from in case of errors
mysql-test/r/innodb.result:
  More warnings from in case of errors
mysql-test/r/key_cache.result:
  More warnings from in case of errors
mysql-test/r/myisam.result:
  More warnings from in case of errors
mysql-test/r/preload.result:
  More warnings from in case of errors
mysql-test/r/repair.result:
  More warnings from in case of errors
mysql-test/r/rpl_failed_optimize.result:
  More warnings from in case of errors
mysql-test/r/subselect.result:
  More warnings from in case of errors
mysql-test/t/backup.test:
  Portability fix
mysql-test/t/innodb.test:
  Avoid some warnings
mysql-test/t/myisam.test:
  Portability fix
mysql-test/t/rpl_rotate_logs.test:
  Portablitiy fix
mysys/errors.c:
  Move ER_FILENOTFOUND last to avoid error 0
sql/mysql_priv.h:
  Indentation change
sql/mysqld.cc:
  Save all given errors for SHOW ERRORS
sql/protocol.cc:
  Store new errors for SHOW ERROR
  (Ignore those that are already reported with my_error())
sql/sql_class.cc:
  More errors with SHOW ERROR
sql/sql_class.h:
  More errors with SHOW ERROR
sql/sql_error.cc:
  More errors with SHOW ERROR
sql/sql_parse.cc:
  Temporary fix: Don't give error for the to-be-removed 'pre-open tables code'
sql/sql_show.cc:
  More debugging
  Don't register errors while populating schema tables.
  (If we do, we get a LOT of warnings from information_schema.test)
sql/sql_table.cc:
  Don't register errors from handler in drop table (as we already do it the upper level DROP TABLE code)
  Don't register errors for 'restore_table' as in most cases the table doesn't exists
sql/sql_union.cc:
  Use file->write_row() instead of 'write_record'.
  This gives us easer to handle error messages and is faster than the old version

into zim.(none):/home/brian/mysql/mysql-5.0

Funny sometimes how things work when in reality you would think it would crash pretty hard :)


sql/examples/ha_archive.cc:
  Solves bug #8691. This was reported in an internal build. Renamed ptr to bptr.

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/tools/drop_index.cpp:
  Auto merged
ndb/tools/drop_tab.cpp:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

  Wait some for all nodes to get connected


ndb/tools/drop_index.cpp:
  Wait some for all nodes to get connected
ndb/tools/drop_tab.cpp:
  Wait some for all nodes to get connected

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged