Commit bac7f104 authored by unknown's avatar unknown
Browse files

Fix after merge of 5.0, fix of a result file which somebody hadn't updated. 

"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  compared with 5.0, this part has to move to the wrappers as the arg of --start-position depends on row-based or statement-based replication
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  result update
mysql-test/r/rpl_row_UUID.result:
  result update (somebody had forgotten to run row-based tests, the solution is to use "make test" :)
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  merge from 5.0
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  merge form 5.0
sql/mysqld.cc:
  fix after merge
sql/sp_head.cc:
  fix after merge
parent b3621ef6

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+0 −14
Original line number Diff line number Diff line
@@ -270,17 +270,3 @@ disconnect con3; 


connection con4;

select get_lock("a",10); # wait for rollback to finish
 


# we check that the error code of the "ROLLBACK" event is 0 and not

# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction

# and does not make slave to stop)

--exec $MYSQL_BINLOG --start-position=547 $MYSQL_TEST_DIR/var/log/master-bin.000001 > var/tmp/mix_innodb_myisam_binlog.output

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval select

(@a:=load_file("$MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

drop table t1, t2;

mysql-test/r/binlog_row_mix_innodb_myisam.result

+24 −0
Original line number Diff line number Diff line
@@ -281,3 +281,27 @@ master-bin.000001 1092 Write_rows 1 # 
master-bin.000001	1126	Query	1	#	use `test`; create table t2 (n int) engine=innodb

do release_lock("lock1");

drop table t0,t2;

reset master;

create table t1 (a int) engine=innodb;

create table t2 (a int) engine=myisam;

select get_lock("a",10);

get_lock("a",10)

1

begin;

insert into t1 values(8);

insert into t2 select * from t1;

select get_lock("a",10);

get_lock("a",10)

1

select

(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null;

(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null

1

select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"

1	1

drop table t1, t2;

mysql-test/t/binlog_row_mix_innodb_myisam.test

+18 −0
Original line number Diff line number Diff line
@@ -3,3 +3,21 @@ 


-- source include/have_binlog_format_row.inc

-- source extra/binlog_tests/mix_innodb_myisam_binlog.test



# This piece below cannot be put into

# extra/binlog_tests/mix_innodb_myisam_binlog.test

# because the argument of --start-position differs between statement-

# and row-based (and "eval --exec" doesn't work).

# we check that the error code of the "ROLLBACK" event is 0 and not

# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction

# and does not make slave to stop)

--exec $MYSQL_BINLOG --start-position=516 $MYSQL_TEST_DIR/var/log/master-bin.000001 > var/tmp/mix_innodb_myisam_binlog.output

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval select

(@a:=load_file("$MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

drop table t1, t2;

mysql-test/t/binlog_stm_mix_innodb_myisam.test

+18 −0
Original line number Diff line number Diff line
@@ -3,3 +3,21 @@ 


-- source include/have_binlog_format_statement.inc

-- source extra/binlog_tests/mix_innodb_myisam_binlog.test



# This piece below cannot be put into

# extra/binlog_tests/mix_innodb_myisam_binlog.test

# because the argument of --start-position differs between statement-

# and row-based (and "eval --exec" doesn't work).

# we check that the error code of the "ROLLBACK" event is 0 and not

# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction

# and does not make slave to stop)

--exec $MYSQL_BINLOG --start-position=551 $MYSQL_TEST_DIR/var/log/master-bin.000001 > var/tmp/mix_innodb_myisam_binlog.output

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval select

(@a:=load_file("$MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

drop table t1, t2;

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -5228,8 +5228,8 @@ Disable with --skip-innodb-doublewrite.", (gptr*) &innobase_use_doublewrite, 
  */

  {"log-bin-trust-function-creators", OPT_LOG_BIN_TRUST_FUNCTION_CREATORS,

   "If equal to 0 (the default), then when --log-bin is used, creation of "

   "a function (a trigger) is allowed only to users having the SUPER privilege "

   "and only if this function (trigger) may not break binary logging."

   "a stored function (or trigger) is allowed only to users having the SUPER privilege "

   "and only if this stored function (trigger) may not break binary logging."

#ifdef HAVE_ROW_BASED_REPLICATION

   " If using --binlog-format=row, the security issues do not exist and the "

   "binary logging cannot break so this option is automatically set to 1."