Sergei Golubchik
9809f05199
5.5-merge
2011-07-02 22:08:51 +02:00
Sergei Golubchik
0accbd0364
lots of post-merge changes
2011-04-25 17:22:25 +02:00
Alfranio Correia
25a9c56d67
Fixing test case that is sporadically failing.
2011-03-25 15:28:11 +00:00
Sven Sandberg
1bd213aec3
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
2010-12-19 18:15:12 +01:00
Bjorn Munch
ef4458af07
Tests: many if/while expresissons simplified after 57276
2010-11-17 11:16:13 +01:00
Sven Sandberg
cf5ebc5821
BUG#50670: Slave stops with error code 1644
...
Clarified error messages related to unsafe statements:
- avoid the internal technical term "row injection"
- use 'binary log' instead of 'binlog'
- avoid the word 'unsafeness'
mysql-test/extra/binlog_tests/blackhole.test:
updated suppression pattern
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
updated suppression pattern
mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test:
updated suppression pattern
mysql-test/extra/rpl_tests/rpl_insert_id.test:
updated suppression pattern
mysql-test/extra/rpl_tests/rpl_loaddata.test:
updated suppression pattern
mysql-test/extra/rpl_tests/rpl_mixing_engines.test:
updated suppression pattern
mysql-test/extra/rpl_tests/rpl_start_stop_slave.test:
updated suppression pattern
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
updated suppression pattern
mysql-test/extra/rpl_tests/rpl_stop_middle_group.test:
updated suppression pattern
mysql-test/r/archive.result:
updated result file
mysql-test/r/commit_1innodb.result:
updated result file
mysql-test/r/ctype_cp932_binlog_stm.result:
updated result file
mysql-test/r/partition_innodb_stmt.result:
updated result file
mysql-test/suite/binlog/r/binlog_innodb.result:
updated result file
mysql-test/suite/binlog/r/binlog_killed.result:
updated result file
mysql-test/suite/binlog/r/binlog_multi_engine.result:
updated result file
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
updated result file
mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result:
updated result file
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
updated result file
mysql-test/suite/binlog/r/binlog_stm_do_db.result:
updated result file
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
updated result file
mysql-test/suite/binlog/r/binlog_stm_ps.result:
updated result file
mysql-test/suite/binlog/r/binlog_stm_row.result:
updated result file
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result:
updated result file
mysql-test/suite/binlog/r/binlog_unsafe.result:
updated result file
mysql-test/suite/binlog/t/binlog_killed.test:
updated suppression pattern
mysql-test/suite/binlog/t/binlog_multi_engine.test:
updated suppression pattern
mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test:
updated suppression pattern
mysql-test/suite/binlog/t/binlog_stm_ps.test:
updated suppression pattern
mysql-test/suite/binlog/t/binlog_stm_row.test:
updated suppression pattern
mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test:
updated suppression pattern
mysql-test/suite/binlog/t/binlog_tmp_table.test:
updated suppression pattern
mysql-test/suite/binlog/t/binlog_unsafe.test:
updated suppression pattern
mysql-test/suite/ndb/r/ndb_binlog_format.result:
updated result file
mysql-test/suite/ndb/t/ndb_binlog_format.test:
updated suppression pattern
mysql-test/suite/perfschema/r/binlog_stmt.result:
updated result file
mysql-test/suite/perfschema/t/binlog_stmt.test:
updated suppression pattern
mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result:
updated result file
mysql-test/suite/rpl/r/rpl_blackhole.result:
updated result file
mysql-test/suite/rpl/r/rpl_concurrency_error.result:
updated result file
mysql-test/suite/rpl/r/rpl_get_lock.result:
updated result file
mysql-test/suite/rpl/r/rpl_insert_id.result:
updated result file
mysql-test/suite/rpl/r/rpl_insert_ignore.result:
updated result file
mysql-test/suite/rpl/r/rpl_misc_functions.result:
updated result file
mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result:
updated result file
mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result:
updated result file
mysql-test/suite/rpl/r/rpl_mysql_upgrade.result:
updated result file
mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result:
updated result file
mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result:
updated result file
mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result:
updated result file
mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result:
updated result file
mysql-test/suite/rpl/r/rpl_read_only.result:
updated result file
mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result:
updated result file
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
updated result file
mysql-test/suite/rpl/r/rpl_row_mixing_engines.result:
updated result file
mysql-test/suite/rpl/r/rpl_slow_query_log.result:
updated result file
mysql-test/suite/rpl/r/rpl_sp.result:
updated result file
mysql-test/suite/rpl/r/rpl_stm_000001.result:
updated result file
mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result:
updated result file
mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result:
updated result file
mysql-test/suite/rpl/r/rpl_stm_loadfile.result:
updated result file
mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result:
updated result file
mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result:
updated result file
mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result:
updated result file
mysql-test/suite/rpl/r/rpl_temp_temporary.result:
updated result file
mysql-test/suite/rpl/r/rpl_variables_stm.result:
updated result file
mysql-test/suite/rpl/t/rpl000013.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_blackhole.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_concurrency_error.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_get_lock.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_insert.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_insert_id.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_insert_ignore.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_invoked_features.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_misc_functions.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_optimize.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_read_only.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_semi_sync.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_semi_sync_event.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_session_var.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_slow_query_log.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_sp.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_stm_found_rows.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_stm_loadfile.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_temp_table.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_temp_temporary.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_temporary.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_timezone.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_trigger.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_udf.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_user_variables.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_variables_stm.test:
updated suppression pattern
mysql-test/suite/rpl/t/rpl_view_multi.test:
updated suppression pattern
mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result:
updated result file
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test:
updated suppression pattern
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
updated suppression pattern
mysql-test/suite/sys_vars/t/rpl_init_slave_func.test:
updated suppression pattern
mysql-test/t/archive.test:
updated suppression pattern
mysql-test/t/commit_1innodb.test:
updated suppression pattern
mysql-test/t/create_select_tmp.test:
updated suppression pattern
mysql-test/t/ctype_cp932_binlog_stm.test:
updated suppression pattern
mysql-test/t/lock_sync.test:
updated suppression pattern
mysql-test/t/mysqlbinlog.test:
updated suppression pattern
mysql-test/t/mysqldump.test:
updated suppression pattern
mysql-test/t/sp_trans.test:
updated suppression pattern
sql/log_event.cc:
Clarified error message.
sql/share/errmsg-utf8.txt:
Clarified error messages.
2010-04-28 14:47:49 +02:00
Alfranio Correia
5dcb0e447f
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
...
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test
Text conflict in mysql-test/r/mysqlbinlog2.result
Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result
Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
Text conflict in mysql-test/suite/rpl/r/rpl_udf.result
Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
Text conflict in sql/field.h
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysql_priv.h
Text conflict in sql/share/errmsg.txt
Text conflict in sql/sp.cc
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_base.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_db.cc
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_insert.cc
Text conflict in sql/sql_lex.cc
Text conflict in sql/sql_lex.h
Text conflict in sql/sql_load.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_update.cc
Text conflict in sql/sql_view.cc
Conflict adding files to storage/innobase. Created directory.
Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory.
Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved.
Conflict adding files to storage/innobase/handler. Created directory.
Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory.
Contents conflict in storage/innobase/handler/ha_innodb.cc
2010-01-07 15:39:11 +00:00
He Zhenxing
c926610d7c
Bug#49020 Semi-sync master crashed with free_pool == NULL, assertion `free_pool_'
...
Before this patch, semisync assumed transactions running in parallel
can not be larger than max_connections, but this is not true when
the event scheduler is executing events, and cause semisync run out
of preallocated transaction nodes.
Fix the problem by allocating transaction nodes dynamically.
This patch also fixed a possible deadlock when running UNINSTALL
PLUGIN rpl_semi_sync_master and updating in parallel. Fixed by
releasing the internal Delegate lock before unlock the plugins.
mysql-test/suite/rpl/t/rpl_semi_sync_event.test:
Add test case for bug#49020
plugin/semisync/semisync_master.cc:
Allocating TranxNode dynamically
plugin/semisync/semisync_master.h:
Allocating TranxNode dynamically
sql/rpl_handler.cc:
Unlock plugins after we have released the Delegate lock to avoid possible deadlock when uninstalling semisync master plugin and doing update in parallel.
2009-12-04 09:46:33 +08:00
