diff options
author | Matthias Leich mleich@mysql.com <Unknown> | 2008-06-03 12:21:48 +0200 |
---|---|---|
committer | Matthias Leich mleich@mysql.com <Unknown> | 2008-06-03 12:21:48 +0200 |
commit | 8d7fcad1967a08a1d4dda5f6084f35c4f8ae2a93 (patch) | |
tree | 1fdcef9d15d2faa857ca708ae49bacbc511c51fd /mysql-test/suite/funcs_1/r/myisam_trig_09.result | |
parent | c392457f7c234f55dfb74104771b216b15458383 (diff) | |
parent | 15440264430b8dd7c10d950926a34f8f20f14427 (diff) | |
download | mariadb-git-8d7fcad1967a08a1d4dda5f6084f35c4f8ae2a93.tar.gz |
Upmerge of fix for
Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
Diffstat (limited to 'mysql-test/suite/funcs_1/r/myisam_trig_09.result')
-rw-r--r-- | mysql-test/suite/funcs_1/r/myisam_trig_09.result | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result index d1af3c562e2..0af360c5bfb 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result @@ -1,17 +1,11 @@ USE test; -drop table if exists tb3 ; +drop table if exists tb3; 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,12 +53,12 @@ f172 numeric zerofill, f173 numeric unsigned zerofill, f174 numeric (0), f175 numeric (64) -) Engine = myisam; +) 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/myisam_tb3.txt' +load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt' into table tb3; Testcase 3.5.9.1/2: @@ -74,9 +68,9 @@ set new.f142 = 94087, @counter=@counter+1; TotalRows 10 Affected -8 +9 NotAffected -2 +1 NewValuew 0 set @counter=0; @@ -84,7 +78,7 @@ Update tb3 Set f142='1' where f130<100; select count(*) as ExpectedChanged, @counter as TrigCounter from tb3 where f142=94087; ExpectedChanged TrigCounter -8 8 +9 9 select count(*) as ExpectedNotChange from tb3 where f130<100 and f142<>94087; ExpectedNotChange |