database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-04 17:23:46 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
This commit is contained in:
knielsen@mysql.com
2006-02-20 09:52:22 +01:00
parent 1e437a1fda c15158e108
commit 4fc82049c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/binlog_stm_mix_innodb_myisam.result
View File

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