database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Merge 5.0->5.1
mysql-test/r/binlog_stm_binlog.result:
  Merge 5.0->5.1
This commit is contained in:
unknown
2007-06-08 07:21:36 +02:00
parent 055a0b85b6 44626a6de8
commit e4d2a0c5cd
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/include/uses_vardir.inc
View File

@ -7,9 +7,8 @@
# outside of it's vardir anyway # outside of it's vardir anyway
# #
let $datadir=
query_get_value("SHOW VARIABLES LIKE 'datadir'", Value, 1); if (`select LOCATE('$MYSQLTEST_VARDIR', REPLACE(@@datadir, '\\\\', '/')) != 1`)
if (`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`)
{ {
skip Need mysqld in MYSQLTEST_VARDIR; skip Need mysqld in MYSQLTEST_VARDIR;
} }

9
mysql-test/lib/mtr_cases.pl
View File

@ -607,9 +607,12 @@ sub collect_one_test_case($$$$$$$) {
} }
else else
{ {
# Test does not need binlog, add --skip-binlog to if ( $::mysql_version_id >= 50100 )
# the options used when starting it {
push(@{$tinfo->{'master_opt'}}, "--skip-log-bin"); # Test does not need binlog, add --skip-binlog to
# the options used when starting it
push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
}
} }
} }