Skip to content

M
mariadb
Commit 4fc82049 authored by knielsen@mysql.com's avatar knielsen@mysql.com
Browse files
Options

Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest 

into  mysql.com:/usr/local/mysql/mysql-5.1-new
parents 1e437a1f c15158e1
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/binlog_stm_mix_innodb_myisam.result
View file @ 4fc82049
...@@ -269,9 +269,9 @@ select get_lock("a",10); ...@@ -269,9 +269,9 @@ select get_lock("a",10);
get_lock("a",10) get_lock("a",10)
1 1
select select
(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output")) (@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
is not null; is not null;
(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output")) (@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
is not null is not null
1 1
select select
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7