#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-53075/mysql-6.0-codebase-bugfixing/ based on revid:horst.hunger@stripped
3835 Alfranio Correia 2010-04-26 [merge]
merge mysql-next-mr-bugfixing --> mysql-6.0-codebase-bugfixing
modified:
mysql-test/suite/rpl/r/rpl_temp_temporary.result
mysql-test/suite/rpl/t/rpl_temp_temporary.test
sql/log_event.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_parse.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_temp_temporary.result'
--- a/mysql-test/suite/rpl/r/rpl_temp_temporary.result 2010-04-20 09:10:43 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temp_temporary.result 2010-04-26 09:02:29 +0000
@@ -174,6 +174,48 @@ master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tmp2` /* generated by server */
master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tmp3` /* generated by server */
master-bin.000001 # Query # # ROLLBACK
+########################################################################
+# VERIFY ITEM 7
+########################################################################
+SET BINLOG_FORMAT=STATEMENT;
+CREATE TEMPORARY TABLE tmp1(id int) engine= MyIsam;
+CREATE TABLE t_myisam (f1 BIGINT) ENGINE = MyISAM;
+CREATE TABLE t_innodb (f1 BIGINT) ENGINE = Innodb;
+BEGIN;
+INSERT INTO t_myisam VALUES(CONNECTION_ID());
+INSERT INTO tmp1 VALUES(1);
+INSERT INTO t_myisam VALUES(1);
+Warnings:
+Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction.
+INSERT INTO t_innodb VALUES(1);
+INSERT INTO t_myisam VALUES(CONNECTION_ID());
+Warnings:
+Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction.
+INSERT INTO t_innodb VALUES(1);
+COMMIT;
+DROP TABLE t_myisam;
+DROP TABLE t_innodb;
+show binlog events from <binlog_start>;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE tmp1(id int) engine= MyIsam
+master-bin.000001 # Query # # use `test`; CREATE TABLE t_myisam (f1 BIGINT) ENGINE = MyISAM
+master-bin.000001 # Query # # use `test`; CREATE TABLE t_innodb (f1 BIGINT) ENGINE = Innodb
+master-bin.000001 # Query # # BEGIN
+master-bin.000001 # Query # # use `test`; INSERT INTO t_myisam VALUES(CONNECTION_ID())
+master-bin.000001 # Query # # COMMIT
+master-bin.000001 # Query # # BEGIN
+master-bin.000001 # Query # # use `test`; INSERT INTO t_myisam VALUES(1)
+master-bin.000001 # Query # # COMMIT
+master-bin.000001 # Query # # BEGIN
+master-bin.000001 # Query # # use `test`; INSERT INTO t_myisam VALUES(CONNECTION_ID())
+master-bin.000001 # Query # # COMMIT
+master-bin.000001 # Query # # BEGIN
+master-bin.000001 # Query # # use `test`; INSERT INTO tmp1 VALUES(1)
+master-bin.000001 # Query # # use `test`; INSERT INTO t_innodb VALUES(1)
+master-bin.000001 # Query # # use `test`; INSERT INTO t_innodb VALUES(1)
+master-bin.000001 # Xid # # COMMIT /* XID */
+master-bin.000001 # Query # # use `test`; DROP TABLE t_myisam
+master-bin.000001 # Query # # use `test`; DROP TABLE t_innodb
###################################################################################
# CHECK CONSISTENCY
###################################################################################
=== modified file 'mysql-test/suite/rpl/t/rpl_temp_temporary.test'
--- a/mysql-test/suite/rpl/t/rpl_temp_temporary.test 2010-04-20 09:10:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temp_temporary.test 2010-04-26 09:02:29 +0000
@@ -34,6 +34,10 @@
# the CREATE TEMPORARY is not logged and the DROP TEMPORARY is extended with
# the IF EXISTS clause.
#
+# 7 - It also verifies if the CONNECTION_ID along with a non-transactional
+# table is written outside the transaction boundaries and is not classified
+# as unsafe. See BUG#53075.
+#
################################################################################
source include/master-slave.inc;
@@ -163,6 +167,29 @@ DROP TEMPORARY TABLE tmp3;
ROLLBACK;
source include/show_binlog_events.inc;
+--echo ########################################################################
+--echo # VERIFY ITEM 7
+--echo ########################################################################
+
+SET BINLOG_FORMAT=STATEMENT;
+let $binlog_start= query_get_value("SHOW MASTER STATUS", Position, 1);
+
+CREATE TEMPORARY TABLE tmp1(id int) engine= MyIsam;
+CREATE TABLE t_myisam (f1 BIGINT) ENGINE = MyISAM;
+CREATE TABLE t_innodb (f1 BIGINT) ENGINE = Innodb;
+
+BEGIN;
+INSERT INTO t_myisam VALUES(CONNECTION_ID());
+INSERT INTO tmp1 VALUES(1);
+INSERT INTO t_myisam VALUES(1);
+INSERT INTO t_innodb VALUES(1);
+INSERT INTO t_myisam VALUES(CONNECTION_ID());
+INSERT INTO t_innodb VALUES(1);
+COMMIT;
+DROP TABLE t_myisam;
+DROP TABLE t_innodb;
+source include/show_binlog_events.inc;
+
--echo ###################################################################################
--echo # CHECK CONSISTENCY
--echo ###################################################################################
@@ -172,3 +199,5 @@ sync_slave_with_master;
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/test-nmt-master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/test-nmt-slave.sql
--diff_files $MYSQLTEST_VARDIR/tmp/test-nmt-master.sql $MYSQLTEST_VARDIR/tmp/test-nmt-slave.sql
+
+
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc 2010-04-20 12:11:25 +0000
+++ b/sql/log_event.cc 2010-04-26 09:22:26 +0000
@@ -680,7 +680,7 @@ Log_event::Log_event(THD* thd_arg, uint1
server_id= thd->server_id;
when= thd->start_time;
cache_type= (using_trans || stmt_has_updated_trans_table(thd)
- || thd->thread_specific_used
+ || thd->thread_temporary_used
? Log_event::EVENT_TRANSACTIONAL_CACHE :
Log_event::EVENT_STMT_CACHE);
}
@@ -2555,7 +2555,7 @@ Query_log_event::Query_log_event(THD* th
else
{
cache_type= ((using_trans || stmt_has_updated_trans_table(thd) ||
- force_trans || thd->thread_specific_used)
+ force_trans || thd->thread_temporary_used)
? Log_event::EVENT_TRANSACTIONAL_CACHE :
Log_event::EVENT_STMT_CACHE);
}
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc 2010-04-20 12:11:25 +0000
+++ b/sql/sql_class.cc 2010-04-26 09:22:26 +0000
@@ -3852,6 +3852,7 @@ int THD::decide_logging_format(TABLE_LIS
trans_non_trans_access_engines= (prev_trans != act_trans);
multi_access_engine= TRUE;
}
+ thread_temporary_used |= table->table->s->tmp_table;
prev_access_table= table->table;
}
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h 2010-04-20 12:11:25 +0000
+++ b/sql/sql_class.h 2010-04-26 09:22:26 +0000
@@ -2158,6 +2158,11 @@ public:
/** is set if some thread specific value(s) used in a statement. */
bool thread_specific_used;
+ /**
+ is set if a statement accesses a temporary table created through
+ CREATE TEMPORARY TABLE.
+ */
+ bool thread_temporary_used;
bool charset_is_system_charset, charset_is_collation_connection;
bool charset_is_character_set_filesystem;
bool enable_slow_log; /* enable slow log for current statement */
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc 2010-04-21 07:59:29 +0000
+++ b/sql/sql_parse.cc 2010-04-26 09:22:26 +0000
@@ -5850,7 +5850,7 @@ void THD::reset_for_next_command()
thd->transaction.all.modified_non_trans_table= FALSE;
}
DBUG_ASSERT(thd->security_ctx== &thd->main_security_ctx);
- thd->thread_specific_used= FALSE;
+ thd->thread_specific_used= thd->thread_temporary_used= FALSE;
if (opt_bin_log)
{
Attachment: [text/bzr-bundle]
| Thread |
|---|
| • bzr commit into mysql-6.0-codebase-bugfixing branch(alfranio.correia:3835) | Alfranio Correia | 26 Apr |
