diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/endspace.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 9 | ||||
| -rw-r--r-- | mysql-test/r/ps_3innodb.result | 10 | ||||
| -rw-r--r-- | mysql-test/r/rowid_order_innodb.result | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/mysql-test/r/endspace.result b/mysql-test/r/endspace.result index b1942409c91..e9396c9a6ed 100644 --- a/mysql-test/r/endspace.result +++ b/mysql-test/r/endspace.result @@ -178,7 +178,7 @@ teststring teststring explain select * from t1 order by text1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL key1 32 NULL 3 Using index +1 SIMPLE t1 index NULL key1 34 NULL 3 Using index alter table t1 modify text1 char(32) binary not null; select * from t1 order by text1; text1 diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index be73f6986ac..461cf269755 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1466,13 +1466,13 @@ Error 1146 Table 'test.t4' doesn't exist checksum table t1, t2, t3; Table Checksum test.t1 2948697075 -test.t2 968604391 -test.t3 968604391 +test.t2 1157260244 +test.t3 1157260244 checksum table t1, t2, t3 extended; Table Checksum test.t1 3092701434 -test.t2 968604391 -test.t3 968604391 +test.t2 1157260244 +test.t3 1157260244 drop table t1,t2,t3; create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=innodb; insert into t1 values(1,'first','fff'),(2,'second','sss'),(3,'third','ttt'); @@ -1809,6 +1809,5 @@ show variables like "innodb_thread_sleep_delay"; Variable_name Value innodb_thread_sleep_delay 10000 create table t1 (v varchar(16384)) engine=innodb; -ERROR 42000: Column length too big for column 'v' (max = 255); use BLOB instead create table t1 (a bit, key(a)) engine=innodb; ERROR 42000: The storage engine for the table doesn't support BIT FIELD diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 940f5e8cbac..9a0927a9a5c 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -70,7 +70,7 @@ def test t9 t9 c18 c18 1 4 1 Y 32768 0 63 def test t9 t9 c19 c19 1 1 1 Y 32768 0 63 def test t9 t9 c20 c20 254 1 1 Y 0 0 8 def test t9 t9 c21 c21 254 10 10 Y 0 0 8 -def test t9 t9 c22 c22 254 30 30 Y 0 0 8 +def test t9 t9 c22 c22 253 30 30 Y 0 0 8 def test t9 t9 c23 c23 252 255 8 Y 144 0 63 def test t9 t9 c24 c24 252 255 8 Y 16 0 8 def test t9 t9 c25 c25 252 65535 4 Y 144 0 63 @@ -1691,8 +1691,8 @@ affected rows: 3 info: Records: 3 Duplicates: 0 Warnings: 0 select a,b from t2 order by a ; a b -3 duplicate -4 duplicate +3 duplicate +4 duplicate 103 three delete from t2 ; prepare stmt1 from ' insert into t2 (b,a) @@ -1710,8 +1710,8 @@ affected rows: 3 info: Records: 3 Duplicates: 0 Warnings: 0 select a,b from t2 order by a ; a b -3 duplicate -4 duplicate +3 duplicate +4 duplicate 103 three drop table t2; drop table if exists t5 ; diff --git a/mysql-test/r/rowid_order_innodb.result b/mysql-test/r/rowid_order_innodb.result index f76002e9cb2..d55029f9064 100644 --- a/mysql-test/r/rowid_order_innodb.result +++ b/mysql-test/r/rowid_order_innodb.result @@ -178,9 +178,9 @@ insert into t1 values ('','empt',2,2), ('dddd','d--d',2,2); select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3; pk1 pk2 key1 key2 - empt 2 2 a a--a 2 2 bb b--b 2 2 ccc c--c 2 2 dddd d--d 2 2 + empt 2 2 drop table t1; |