[Commits] Rev 3159: Merge fix for small_blocksize.test in lp:maria/5.3

Michael Widenius monty at askmonty.org
Tue Aug 16 23:45:09 EEST 2011


At lp:maria/5.3

------------------------------------------------------------
revno: 3159 [merge]
revision-id: monty at askmonty.org-20110816204508-hduu1db2zpwd476m
parent: psergey at askmonty.org-20110816175448-i1wnkw5sou88ytev
parent: monty at askmonty.org-20110816160215-0wdjuvavztfpr2w5
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.3
timestamp: Tue 2011-08-16 23:45:08 +0300
message:
  Merge fix for small_blocksize.test
modified:
  mysql-test/suite/maria/r/small_blocksize.result small_blocksize.resu-20110815124116-pn4dqjfkaj7vxqsh-1
  mysql-test/suite/maria/t/small_blocksize.test small_blocksize.test-20110815124116-pn4dqjfkaj7vxqsh-3
-------------- next part --------------
=== modified file 'mysql-test/suite/maria/r/small_blocksize.result'
--- a/mysql-test/suite/maria/r/small_blocksize.result	2011-08-15 13:39:53 +0000
+++ b/mysql-test/suite/maria/r/small_blocksize.result	2011-08-16 16:01:31 +0000
@@ -13,48 +13,6 @@ create table t1 (a int primary key auto_
 insert into t1 (vl,bl) values (10,10),(100,100),(1000,1000),(5000,5000),(8000,12000);
 update t1 set c="test", v1=repeat('a',vl),v2=repeat('b',vl/2),b1=repeat('c',bl),b2=repeat('d',bl);
 insert into t1 (vl,bl) values (10,10),(100,100),(1000,1000),(1000,5000);
-update t1 set c="test", v1=repeat(vl/4,'a'),v2=repeat(vl/5,'b'),b1=repeat(b1*2,'c'),b2=repeat(bl/2,'d');
-Warnings:
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
-Warning 1292    Truncated incorrect INTEGER value: 'a'
-Warning 1292    Truncated incorrect INTEGER value: 'b'
-Warning 1292    Truncated incorrect INTEGER value: 'c'
-Warning 1292    Truncated incorrect INTEGER value: 'd'
 update t1 set c="test", v1=repeat('a',vl/4),v2=repeat('b',vl/5),b1=repeat('c',bl*2),b2=repeat('d',bl/2);
 insert into t1 (vl,bl) values (100,100);
 update t1 set c="test", v1=repeat('a',vl),v2=repeat('b',vl),b1=repeat('c',bl*2),b2=repeat('d',bl/2);

=== modified file 'mysql-test/suite/maria/t/small_blocksize.test'
--- a/mysql-test/suite/maria/t/small_blocksize.test	2011-08-15 13:39:53 +0000
+++ b/mysql-test/suite/maria/t/small_blocksize.test	2011-08-16 16:01:31 +0000
@@ -16,7 +16,6 @@ create table t1 (a int primary key auto_
 insert into t1 (vl,bl) values (10,10),(100,100),(1000,1000),(5000,5000),(8000,12000);
 update t1 set c="test", v1=repeat('a',vl),v2=repeat('b',vl/2),b1=repeat('c',bl),b2=repeat('d',bl);
 insert into t1 (vl,bl) values (10,10),(100,100),(1000,1000),(1000,5000);
-update t1 set c="test", v1=repeat(vl/4,'a'),v2=repeat(vl/5,'b'),b1=repeat(b1*2,'c'),b2=repeat(bl/2,'d');
 update t1 set c="test", v1=repeat('a',vl/4),v2=repeat('b',vl/5),b1=repeat('c',bl*2),b2=repeat('d',bl/2);
 insert into t1 (vl,bl) values (100,100);
 update t1 set c="test", v1=repeat('a',vl),v2=repeat('b',vl),b1=repeat('c',bl*2),b2=repeat('d',bl/2);



More information about the commits mailing list