From 43eb70d0bf060c12eba544abfdf4eff8bd96bd3a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 26 Oct 2010 16:58:52 +0200 Subject: Make the skip-on-windows check as the first one, as the master-slave include fails on windows. --- mysql-test/suite/rpl/t/rpl_loaddata_symlink.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test') diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test b/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test index 63e65834e5b..69b481bddd1 100644 --- a/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test +++ b/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test @@ -3,8 +3,8 @@ # This test verifies if loading data infile will work fine # if the path of the load data file is a symbolic link. # ---source include/master-slave.inc --source include/not_windows.inc +--source include/master-slave.inc --source include/have_binlog_format_statement.inc create table t1(a int not null auto_increment, b int, primary key(a) ); -- cgit v1.2.1 From 6cbd81017b565958bec86f5b8ef8e35ac1bd5c51 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 Oct 2010 10:41:45 +0200 Subject: Fix test failure (timeout) in --valgrind tests in Buildbot. The main.ps_ddl test does SELECT * FROM mysql.general_log; that can be really expensive with --valgrind if previous test cases put lots of data in the general log since last server restart. Fix by truncating the log at test start. --- mysql-test/r/ps_ddl.result | 1 + mysql-test/t/ps_ddl.test | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result index 375f31ef9c4..a5e71e114ca 100644 --- a/mysql-test/r/ps_ddl.result +++ b/mysql-test/r/ps_ddl.result @@ -4,6 +4,7 @@ drop procedure if exists p_verify_reprepare_count; drop procedure if exists p1; drop function if exists f1; drop view if exists v1, v2; +TRUNCATE TABLE mysql.general_log; create procedure p_verify_reprepare_count(expected int) begin declare old_reprepare_count int default @reprepare_count; diff --git a/mysql-test/t/ps_ddl.test b/mysql-test/t/ps_ddl.test index 1543c757908..10a96285451 100644 --- a/mysql-test/t/ps_ddl.test +++ b/mysql-test/t/ps_ddl.test @@ -58,6 +58,10 @@ drop function if exists f1; drop view if exists v1, v2; --enable_warnings +# Avoid selecting from a huge table possibly left over from previous tests, +# as this really hurts --valgrind testing. +TRUNCATE TABLE mysql.general_log; + delimiter |; create procedure p_verify_reprepare_count(expected int) begin -- cgit v1.2.1 From ace69edc47566124918d943ee600c4289e746bdf Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 30 Oct 2010 19:54:38 +0200 Subject: fix LIKE in a vcol function, broken by a fix for mysql bug#54568. don't set view_prepare_mode when opening a base table (either in SHOW CREATE or in I_S.TABLES) --- mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc | 2 +- mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result | 4 ++-- mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc index daf59c38a7e..4f6b960f9d0 100644 --- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc +++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc @@ -407,7 +407,7 @@ let $rows = 1; --source suite/vcol/inc/vcol_supported_sql_funcs.inc --echo # LIKE -let $cols = a varchar(10), b bool as (a like 'H%o'); +let $cols = a varchar(10), b bool as (a like 'H%!o' escape '!'); let $values1 = 'Hello',default; let $values2 = 'MySQL',default; let $rows = 2; diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result index 2bc652a7da2..83f755a2e7f 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result @@ -968,12 +968,12 @@ drop table t1; set sql_warnings = 0; # LIKE set sql_warnings = 1; -create table t1 (a varchar(10), b bool as (a like 'H%o')); +create table t1 (a varchar(10), b bool as (a like 'H%!o' escape '!')); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL, - `b` tinyint(1) AS (a like 'H%o') VIRTUAL + `b` tinyint(1) AS (a like 'H%!o' escape '!') VIRTUAL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 insert into t1 values ('Hello',default); insert into t1 values ('MySQL',default); diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result index a94e220180c..844aae38af2 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result @@ -968,12 +968,12 @@ drop table t1; set sql_warnings = 0; # LIKE set sql_warnings = 1; -create table t1 (a varchar(10), b bool as (a like 'H%o')); +create table t1 (a varchar(10), b bool as (a like 'H%!o' escape '!')); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL, - `b` tinyint(1) AS (a like 'H%o') VIRTUAL + `b` tinyint(1) AS (a like 'H%!o' escape '!') VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values ('Hello',default); insert into t1 values ('MySQL',default); -- cgit v1.2.1