database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
"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
This commit is contained in:
unknown
2006-02-18 23:37:56 +01:00
parent b3621ef6ad
commit bac7f10448
7 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/r/binlog_row_mix_innodb_myisam.result
View File

@@ -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;