1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Manual merge.
This commit is contained in:
unknown 2006-02-20 09:52:22 +01:00
commit b14a6af821
1 changed files with 2 additions and 2 deletions
Show Stats 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