database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.1-maint

Browse Source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
unknown
2007-06-08 07:24:06 +02:00
parent d757901852 e4d2a0c5cd
commit f7cc6d167e
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/is_debug_build.inc
View File

@ -1,4 +0,0 @@
-- require r/is_debug_build.require
--disable_query_log
select instr(version(), "debug") > 0;
--enable_query_log

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

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