When executing drop view statement on the master, the statement is not written into bin-log if any error occurs, this could cause master slave inconsistence if any view has been dropped.
If some error occured and no view has been dropped, don't bin-log the statement, if at least one view has been dropped the query is bin-logged possible with an error.
sql/sql_view.cc:
If at least one view has been dropped the query is bin-logged possible with an error.
mysql-test/suite/rpl/r/rpl_drop_view.result:
Add test result for bug#30998
mysql-test/suite/rpl/t/rpl_drop_view.test:
Add test case for bug#30998
When executing drop view statement on the master, the statement is not written into bin-log if any error occurs, this could cause master slave inconsistence if any view has been dropped.
If some error occured and no view has been dropped, don't bin-log the statement, if at least one view has been dropped the query is bin-logged possible with an error.
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge
mysql-test/lib/mtr_cases.pl:
Manual merge, using remote code.
Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.
mysql-test/suite/rpl/t/disabled.def:
Bug#8693 Test 'rpl_log_pos' fails sometimes
Moved disabling to rpl suite.
into stella.local:/home2/mydev/mysql-5.1-axmrg
include/my_base.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/ndb/t/disabled.def:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
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
client/mysql.cc:
Manual merge
mysql-test/suite/rpl/t/disabled.def:
Manual merge
mysql-test/suite/ndb/t/disabled.def:
Disabling failing tests.
mysql-test/suite/rpl/t/disabled.def:
Disabling failing tests.
mysql-test/suite/rpl/t/rpl_ssl.test:
Disabling part of test that fails.
The test case fails on "vanilla" and "no_innodb" builds.
These builds do not include InnoDB.
The test case requires InnoDB.
Added requirement for InnoDB into the test case, so that
it does not start on those builds.
mysql-test/suite/rpl/t/rpl_row_charset_innodb.test:
Bug#32668 - rpl_row_charset_innodb.test fails
Added requirement for InnoDB.
The test case fails on "vanilla" and "no_innodb" builds.
These builds do not include InnoDB.
The test case requires InnoDB.
Added requirement for InnoDB into the test case, so that
it does not start on those builds.
mysql-test/r/innodb.result:
Result change.
mysql-test/suite/rpl/r/rpl_binlog_grant.result:
Result change.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
Result change.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
Result change.
mysql-test/suite/rpl/t/disabled.def:
Enabling some tests.
mysql-test/suite/rpl/t/rpl_binlog_grant.test:
Adding missing master-slave.inc, causing previous tests to pollute
the binary log.
mysql-test/suite/rpl_ndb/t/disabled.def:
Enabling some tests.
mysql-test/lib/mtr_cases.pl:
updated the code for combination
mysql-test/mysql-test-run.pl:
added soft switching of binlog format
mysql-test/lib/mtr_misc.pl:
added new sub mtr_diff_opts
mysql-test/suite/rpl/r/rpl_invoked_features.result:
updated result
mysql-test/suite/rpl/t/rpl_invoked_features.test:
updated test
mysql-test/suite/rpl/t/rpl_misc_functions.test:
updated test
mysql-test/suite/rpl/t/rpl_session_var.test:
updated test
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_bug31076.result:
Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.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
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/partition.test:
Manual merge.
BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
Manual merge.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
Manual merge.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
Manual merge.
mysql-test/suite/rpl/t/disabled.def:
Manual merge.
sql/sql_delete.cc:
Manual merge.
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31170-rpl_innodb_bug28430_fails
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
manual merge
- Add debug queries
mysql-test/suite/rpl/t/rpl_ssl.test:
Add additional queries to run when we detect that the number of queries between slave and master differs
mysql-test/suite/rpl/r/rpl_found_rows.result:
Result change.
mysql-test/suite/rpl/t/rpl_found_rows.test:
Adding ORDER BY to avoid order dependencies.
Setting BINLOG_FORMAT=MIXED; for all master clients: one were missing.
Dropping procedures that polluted later test results.
Non-deterministic parameters of SHOW SLAVE STATUS are masked out
by means of using the standard include-macro.
The masked-out parameters are not needed by the logics of the original
tests. What is need to demonstre that replication is not stopped remains.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
results changed
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
using the standard macro that takes care of masking out env specific values
Non-deterministic parameters of SHOW SLAVE STATUS are masked out
by means of using the standard include-macro.
The masked-out parameters are not needed by the logics of the original
tests. What is need to demonstre that replication is not stopped remains.
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
mysql-test/suite/binlog/r/binlog_killed.result:
Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
manual merge
sql/log.cc:
manual merge
In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
works only in mixed mode under 5.1. There is a workaround that
can be used in statement-based mode either under 5.0 or 5.1
where the result of FOUND_ROWS() is stored into a user vari-
able and used that way instead. This will replicate correctly
even under statement-based replication, since it will write
a User_var entry to the binary log. For some other cases, the
value has to be passed explicitly.
This patch adds tests to demonstrate that the workarounds docu-
mented for statement-based replication works as advertised, and
does more extensive tests for cases that does not work under sta-
tement-based replication actually work under mixed mode by switch-
ing to row-based replication.
mysql-test/include/reset_master_and_slave.inc:
New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''
mysql-test/suite/rpl/r/rpl_found_rows.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''
mysql-test/suite/rpl/t/rpl_found_rows.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''
In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
works only in mixed mode under 5.1. There is a workaround that
can be used in statement-based mode either under 5.0 or 5.1
where the result of FOUND_ROWS() is stored into a user vari-
able and used that way instead. This will replicate correctly
even under statement-based replication, since it will write
a User_var entry to the binary log. For some other cases, the
value has to be passed explicitly.
This patch adds tests to demonstrate that the workarounds docu-
mented for statement-based replication works as advertised, and
does more extensive tests for cases that does not work under sta-
tement-based replication actually work under mixed mode by switch-
ing to row-based replication.
