database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +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 # 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");
}
} }
} }

2
mysql-test/mysql-test-run.pl
View File

@@ -771,7 +771,7 @@ sub command_line_setup () {
# Find out type of logging that are being used # Find out type of logging that are being used
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# NOTE if the default binlog format is changed, this has to be changed # NOTE if the default binlog format is changed, this has to be changed
$used_binlog_format= "stmt"; $used_binlog_format= "statement";
if (!$opt_extern && $mysql_version_id >= 50100 ) if (!$opt_extern && $mysql_version_id >= 50100 )
{ {
$used_binlog_format= "mixed"; # Default value for binlog format $used_binlog_format= "mixed"; # Default value for binlog format

2
mysql-test/t/sp-code.test
View File

@@ -2,7 +2,7 @@
# Test the debugging feature "show procedure/function code <name>" # Test the debugging feature "show procedure/function code <name>"
# #
-- source include/is_debug_build.inc -- source include/have_debug.inc
--disable_warnings --disable_warnings
drop procedure if exists empty; drop procedure if exists empty;