into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
include/m_ctype.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/rpl_ssl.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/rpl_row_until.test:
Auto merged
mysql-test/t/rpl_ssl.test:
Auto merged
mysql-test/t/rpl_stm_until.test:
Auto merged
mysys/charset-def.c:
Auto merged
mysys/charset.c:
Auto merged
sql/item_create.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_update.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype.c:
Auto merged
BitKeeper/deleted/.del-binlog_innodb.result:
Delete: mysql-test/r/binlog_innodb.result
BitKeeper/deleted/.del-binlog_innodb.test:
Delete: mysql-test/t/binlog_innodb.test
mysql-test/r/binlog_innodb.result:
Fix merge of two independent binlog_innodb tests (from -rpl and -maint)
mysql-test/t/binlog_innodb.test:
Fix merge of two independent binlog_innodb tests (from -rpl and -maint)
mysql-test/r/innodb.result:
Use local (manual merge)
mysql-test/r/multi_update.result:
Use remote (manual merge)
mysql-test/t/rpl_log_pos.test:
Manual merge
mysql-test/r/rpl_log_pos.result:
Manual merge, part 2
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
configure.in:
Auto merged
include/m_ctype.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysys/charset-def.c:
Auto merged
mysys/charset.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype.c:
Auto merged
mysql-test/r/innodb.result:
Manual merge
mysql-test/r/multi_update.result:
Manual merge
mysql-test/t/multi_update.test:
Manual merge
sql/sql_update.cc:
SCCS merged
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
configure.in:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/query_cache.result:
SCCS merged
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysys/charset.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
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_view.cc:
Auto merged
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/extra/rpl_tests/rpl_deadlock.test:
Restoring old test code, but masking out offending columns
mysql-test/r/rpl_deadlock_innodb.result:
Result change
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Merge 5.0->5.1
mysql-test/extra/rpl_tests/rpl_deadlock.test:
Using include/show_slave_status.inc to get correct masking of columns.
mysql-test/r/rpl_deadlock_innodb.result:
result change
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/t/ndb_index_ordered.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/t/greedy_optimizer.test:
Manual merge.
mysql-test/t/join.test:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
and replicated):
A DROP USER statement with a non-existing user was correctly written to
the binary log (there might be users that were removed, but not all),
but the error code was not set, which caused the slave to stop with an
error.
The error reporting code was moved to before the statement was logged
to ensure that the error information for the thread was correctly set
up. This works since my_error() will set the fields net.last_errno and
net.last_error for the thread that is reporting the error, and this
will then be picked up when the Query_log_event is created and written
to the binary log.
sql/sql_acl.cc:
Moving error reporting code to ensure that thd->net.last_err{or,no} is
set and adding debug printout.
mysql-test/r/rpl_grant.result:
New BitKeeper file ``mysql-test/r/rpl_grant.result''
mysql-test/t/rpl_grant.test:
New BitKeeper file ``mysql-test/t/rpl_grant.test''
- Improve shutdown algorithm
- Wait up to 5 seconds for processes to exit after their port is free
mysql-test/lib/mtr_process.pl:
Improve shutdown algorithm, shutdown the server hard
if it hasn't responded to "mysqladmin shutdown" and it's port is free.
Print error to servers error log indicating "hard shutdown"
Give processes up to 5 seconds to exit after their port is free
mysql-test/lib/mtr_report.pl:
Indicate in what file the warning was found
mysql-test/mysql-test-run.pl:
Pass path of process error log to 'mtr_check_stop_servers'
causes later tests to fail.
mysql-test/r/ndb_backup_print.result:
Result change.
mysql-test/t/ndb_backup_print.test:
Adding missing drop table at the end of the test.
into damien-katzs-computer.local:/Users/dkatz/mysql51
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/binlog_multi_engine.result:
Result change
mysql-test/t/binlog_multi_engine.test:
Fixing test case. Keeping some bad statements in the test since I don't
want to disable the entire test. Have marked the offending statement
so that they can easily be found.
Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states
which is buggy, wasteful of time, platform dependant etc.
Fix: use include/wait_for_slave_***.inc's where it's possible instead.
mysql-test/include/wait_for_slave_io_to_stop.inc:
Fix for bug #28772: rpl_row_until fails in pushbuild
- changed to use query_vertical so that it is easier to read the output.
mysql-test/include/wait_for_slave_sql_to_stop.inc:
Fix for bug #28772: rpl_row_until fails in pushbuild
- changed to use query_vertical so that it is easier to read the output.
mysql-test/include/wait_for_slave_to_start.inc:
Fix for bug #28772: rpl_row_until fails in pushbuild
- changed to use query_vertical so that it is easier to read the output.
mysql-test/include/wait_for_slave_to_stop.inc:
Fix for bug #28772: rpl_row_until fails in pushbuild
- changed to use query_vertical so that it is easier to read the output.
mysql-test/t/rpl_row_until.test:
Fix for bug #28772: rpl_row_until fails in pushbuild
- 'sleep 2; wait_for_slave_to_stop;' replaced with sourcing
include/wait_for_slave_sql_to_stop.inc to be more predictable.
mysql-test/t/rpl_stm_until.test:
Fix for bug #28772: rpl_row_until fails in pushbuild
- 'sleep 2; wait_for_slave_to_stop;' replaced with sourcing
include/wait_for_slave_sql_to_stop.inc to be more predictable.
mysql-test/r/sp.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
BitKeeper/deleted/.del-wait_for_slave_io_to_stop.inc:
Auto merged
mysql-test/r/binlog_unsafe.result:
Result change
mysql-test/r/rpl_loaddata_fatal.result:
Result change
mysql-test/r/rpl_udf.result:
Result change
mysql-test/t/binlog_innodb.test:
Test requires binary log
mysql-test/t/binlog_unsafe.test:
Test requires binary log
mysql-test/t/multi_update.test:
Test requires binary log.
Error changed for a statement.
mysql-test/t/rpl_row_basic_11bugs.test:
Error changed for a statement.
- Add test case for this already existing feature
mysql-test/r/mysqltest.result:
Update result file
mysql-test/t/mysqltest.test:
Add test case for this feature
- Move binlog related tests to binlog_innodb.test
- Remove "source include/have_log_bin.inc" from innodb.test
mysql-test/r/innodb.result:
Move binlog related tests to binlog_innodb.test
mysql-test/t/innodb.test:
Move binlog related tests to binlog_innodb.test
mysql-test/r/binlog_innodb.result:
Move binlog related tests to binlog_innodb.test
mysql-test/t/binlog_innodb.test:
Move binlog related tests to binlog_innodb.test
into damien-katzs-computer.local:/Users/dkatz/mysql51
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/sql_yacc.yy:
This line that marks the expression as unsafe for caching now belongs in the create() methods for builder objects inheriting from Create_func.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
Auto merged
mysql-test/t/rpl_ndb_bank.test:
Auto merged
mysql-test/t/rpl_ndb_basic.test:
Auto merged
mysql-test/t/rpl_ndb_do_table.test:
Auto merged
mysql-test/t/rpl_ndb_idempotent.test:
Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
Auto merged
mysql-test/t/rpl_ndb_sync.test:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
mysql-test/include/have_multi_ndb.inc:
manual merge
mysql-test/include/have_ndb.inc:
manual merge
mysql-test/t/rpl_ndb_commit_afterflush.test:
manual merge
mysql-test/t/rpl_ndb_ddl.test:
manual merge
mysql-test/t/rpl_ndb_innodb_trans.test:
manual merge
