Commit 78cca2d5 authored by Mattias Jonsson's avatar Mattias Jonsson
Browse files

merge before pushing

parents 109a041a 92d5c4d7

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ test-bt: 
	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \

	fi

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --suite=funcs_1

	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	    @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2

	-cd mysql-test ; MTR_BUILD_THREAD=auto \
@@ -190,7 +190,7 @@ test-force-full-pl: test-force-full 


test-ext-funcs:

	cd mysql-test ; \

	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \

	    @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \

	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_2



test-ext-rpl:

mysql-test/r/func_misc.result

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ WHERE attempt = 4 - 1 + 1; 
UPDATE t_history SET end_cached = 0

WHERE attempt = 4 - 1 + 1;

# Test 1: Does the query with SLEEP need a reasonable time?

SELECT COUNT(*) > 4 - 1 INTO @aux1 FROM t_history

SELECT COUNT(*) >= 4 - 1 INTO @aux1 FROM t_history

WHERE TIMEDIFF(end_ts,start_ts) - @sleep_time_per_result_row * @row_count

BETWEEN 0 AND @max_acceptable_delay;

SELECT @aux1 AS "Expect 1";
@@ -181,7 +181,7 @@ Expect 1 
1

# Test 2: Does the query with SLEEP need a reasonable time even in case

#         of the non first execution?

SELECT COUNT(*) > 4 - 1 - 1 INTO @aux2 FROM t_history

SELECT COUNT(*) >= 4 - 1 - 1 INTO @aux2 FROM t_history

WHERE TIMEDIFF(end_ts,start_ts) - @sleep_time_per_result_row * @row_count

BETWEEN 0 AND @max_acceptable_delay

AND attempt > 1;

mysql-test/r/query_cache_merge.result

+1674 −0

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/funcs_1/include/tb3.inc

0 → 100644
+66 −0
Original line number Diff line number Diff line 
##### suite/funcs_1/include/tb3.inc

#

# This auxiliary script is used in several Trigger tests.

#

# If the table need data than the file std_data_ln/funcs_1/memory_tb3.txt

# could be used.

#



--disable_warnings

drop table if exists tb3;

--enable_warnings

--replace_result $engine_type <engine_to_be_used>

eval create table tb3 (

f118 char not null DEFAULT 'a',

f119 char binary not null DEFAULT b'101',

f120 char ascii not null DEFAULT b'101',

f121 char(50),

f122 char(50),

f129 binary not null DEFAULT b'101',

f130 tinyint not null DEFAULT 99,

f131 tinyint unsigned not null DEFAULT 99,

f132 tinyint zerofill not null DEFAULT 99,

f133 tinyint unsigned zerofill not null DEFAULT 99,

f134 smallint not null DEFAULT 999,

f135 smallint unsigned not null DEFAULT 999,

f136 smallint zerofill not null DEFAULT 999,

f137 smallint unsigned zerofill not null DEFAULT 999,

f138 mediumint not null DEFAULT 9999,

f139 mediumint unsigned not null DEFAULT 9999,

f140 mediumint zerofill not null DEFAULT 9999,

f141 mediumint unsigned zerofill not null DEFAULT 9999,

f142 int not null DEFAULT 99999,

f143 int unsigned not null DEFAULT 99999,

f144 int zerofill not null DEFAULT 99999,

f145 int unsigned zerofill not null DEFAULT 99999,

f146 bigint not null DEFAULT 999999,

f147 bigint unsigned not null DEFAULT 999999,

f148 bigint zerofill not null DEFAULT 999999,

f149 bigint unsigned zerofill not null DEFAULT 999999,

f150 decimal not null DEFAULT 999.999,

f151 decimal unsigned not null DEFAULT 999.17,

f152 decimal zerofill not null DEFAULT 999.999,

f153 decimal unsigned zerofill,

f154 decimal (0),

f155 decimal (64),

f156 decimal (0) unsigned,

f157 decimal (64) unsigned,

f158 decimal (0) zerofill,

f159 decimal (64) zerofill,

f160 decimal (0) unsigned zerofill,

f161 decimal (64) unsigned zerofill,

f162 decimal (0,0),

f163 decimal (63,30),

f164 decimal (0,0) unsigned,

f165 decimal (63,30) unsigned,

f166 decimal (0,0) zerofill,

f167 decimal (63,30) zerofill,

f168 decimal (0,0) unsigned zerofill,

f169 decimal (63,30) unsigned zerofill,

f170 numeric,

f171 numeric unsigned,

f172 numeric zerofill,

f173 numeric unsigned zerofill,

f174 numeric (0),

f175 numeric (64)

) engine = $engine_type;

mysql-test/suite/funcs_1/r/innodb_trig_0102.result

+13 −21
Original line number Diff line number Diff line
@@ -4,14 +4,8 @@ create table tb3 ( 
f118 char not null DEFAULT 'a',

f119 char binary not null DEFAULT b'101',

f120 char ascii not null DEFAULT b'101',

f121 tinytext,

f122 text,

f123 mediumtext,

f124 longtext unicode,

f125 tinyblob,

f126 blob,

f127 mediumblob,

f128 longblob,

f121 char(50),

f122 char(50),

f129 binary not null DEFAULT b'101',

f130 tinyint not null DEFAULT 99,

f131 tinyint unsigned not null DEFAULT 99,
@@ -59,13 +53,11 @@ f172 numeric zerofill, 
f173 numeric unsigned zerofill,

f174 numeric (0),

f175 numeric (64)

) engine = innodb;

) engine = <engine_to_be_used>;

Warnings:

Note	1265	Data truncated for column 'f150' at row 1

Note	1265	Data truncated for column 'f151' at row 1

Note	1265	Data truncated for column 'f152' at row 1

load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'

into table tb3;



Testcase: 3.5.1.1:

------------------
@@ -194,7 +186,7 @@ Testcase 3.5.1.7: - need to fix 
drop table if exists t1;

Warnings:

Note	1051	Unknown table 't1'

create table t1 (f1 int, f2 char(25),f3 int) engine=innodb;

create table t1 (f1 int, f2 char(25),f3 int) engine = <engine_to_be_used>;

CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1

for each row set new.f3 = '14';

CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -238,7 +230,7 @@ ERROR HY000: Trigger in wrong schema 
drop database if exists trig_db;

create database trig_db;

use trig_db;

create table t1 (f1 integer) engine = innodb;

create table t1 (f1 integer) engine = <engine_to_be_used>;

use test;

CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3

for each row set @ret_trg6_2 = 5;
@@ -266,8 +258,8 @@ Testcase 3.5.1.?: 
-----------------

drop table if exists t1;

drop table if exists t2;

create table t1 (f1 char(50), f2 integer) engine = innodb;

create table t2 (f1 char(50), f2 integer) engine = innodb;

create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;

create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;

create trigger trig before insert on t1

for each row set new.f1 ='trig t1';

create trigger trig before update on t2
@@ -299,15 +291,15 @@ create database trig_db1; 
create database trig_db2;

create database trig_db3;

use trig_db1;

create table t1 (f1 char(50), f2 integer) engine = innodb;

create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;

create trigger trig before insert on t1

for each row set new.f1 ='trig1', @test_var1='trig1';

use trig_db2;

create table t2 (f1 char(50), f2 integer) engine = innodb;

create table t2 (f1 char(50), f2 integer) engine = <engine_to_be_used>;

create trigger trig before insert on t2

for each row set new.f1 ='trig2', @test_var2='trig2';

use trig_db3;

create table t1 (f1 char(50), f2 integer) engine = innodb;

create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;

create trigger trig before insert on t1

for each row set new.f1 ='trig3', @test_var3='trig3';

set @test_var1= '', @test_var2= '', @test_var3= '';
@@ -345,8 +337,8 @@ drop database if exists trig_db2; 
create database trig_db1;

create database trig_db2;

use trig_db1;

create table t1 (f1 char(50), f2 integer) engine = innodb;

create table trig_db2.t1 (f1 char(50), f2 integer) engine = innodb;

create table t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;

create table trig_db2.t1 (f1 char(50), f2 integer) engine = <engine_to_be_used>;

create trigger trig1_b before insert on t1

for each row set @test_var1='trig1_b';

create trigger trig_db1.trig1_a after insert on t1