bzr push into mysql-trunk branch (nisha.gopalakrishnan:3967 to 3968) Bug#13840553

[Nisha Gopalakrishnan]

 3968 Nisha Gopalakrishnan	2012-06-08
      Bug#13840553:64617: MYSQL MUST IMPROVE ERROR MESSAGES
      
      NOTE: This is a follow up patch to fix test failure:
            innodb.innodb_8k

    modified:
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/t/innodb_8k.test
 3967 Vasil Dimov	2012-06-07
      Followup to vasil.dimov@stripped
      
      Run ANALYZE only for InnoDB tests as it confuses MyISAM tests.

    modified:
      mysql-test/include/icp_tests.inc
=== modified file 'mysql-test/suite/innodb/r/innodb_8k.result'
--- a/mysql-test/suite/innodb/r/innodb_8k.result	2012-03-20 08:01:58 +0000
+++ b/mysql-test/suite/innodb/r/innodb_8k.result	2012-06-08 06:43:16 +0000
@@ -115,11 +115,11 @@ ERROR 42000: Specified key was too long;
 #         strict mode and converted to 8 in non-strict mode.
 SET SESSION innodb_strict_mode = ON;
 CREATE TABLE t1 (i int) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Got error 140 from storage engine
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1030	Got error 140 from storage engine
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 SHOW WARNINGS;
 Level	Code	Message
@@ -213,18 +213,18 @@ SHOW VARIABLES LIKE 'innodb_file_per_tab
 Variable_name	Value
 innodb_file_per_table	OFF
 CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+ERROR HY000: Got error 140 from storage engine
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
+Error	1030	Got error 140 from storage engine
 CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Can't create table 'test.t5' (errno: 1478)
+ERROR HY000: Got error 140 from storage engine
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
 Warning	1478	InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8.
-Error	1005	Can't create table 'test.t5' (errno: 1478)
+Error	1030	Got error 140 from storage engine
 SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_file_format = `Antelope`;
 SHOW VARIABLES LIKE 'innodb_file%';
@@ -234,18 +234,18 @@ innodb_file_format_check	ON
 innodb_file_format_max	Barracuda
 innodb_file_per_table	ON
 CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+ERROR HY000: Got error 140 from storage engine
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
+Error	1030	Got error 140 from storage engine
 CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Can't create table 'test.t5' (errno: 1478)
+ERROR HY000: Got error 140 from storage engine
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
 Warning	1478	InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8.
-Error	1005	Can't create table 'test.t5' (errno: 1478)
+Error	1030	Got error 140 from storage engine
 SET GLOBAL innodb_file_format = `Barracuda`;
 # Test 7) Not included here; 16k only
 # Test 8) Test creating a table that could lead to undo log overflow.

=== modified file 'mysql-test/suite/innodb/t/innodb_8k.test'
--- a/mysql-test/suite/innodb/t/innodb_8k.test	2012-03-20 08:01:58 +0000
+++ b/mysql-test/suite/innodb/t/innodb_8k.test	2012-06-08 06:43:16 +0000
@@ -160,7 +160,7 @@ CREATE TABLE t1 (a varchar(128) characte
 
 SET SESSION innodb_strict_mode = ON;
 
---error ER_CANT_CREATE_TABLE
+--error ER_GET_ERRNO
 CREATE TABLE t1 (i int) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
 SHOW WARNINGS;
 
@@ -232,19 +232,19 @@ DROP TABLE t1;
 SET SESSION innodb_strict_mode = ON;
 SET GLOBAL innodb_file_per_table = OFF;
 SHOW VARIABLES LIKE 'innodb_file_per_table';
---error ER_CANT_CREATE_TABLE
+--error ER_GET_ERRNO
 CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
 SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
+--error ER_GET_ERRNO
 CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
 SHOW WARNINGS;
 SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_file_format = `Antelope`;
 SHOW VARIABLES LIKE 'innodb_file%';
---error ER_CANT_CREATE_TABLE
+--error ER_GET_ERRNO
 CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
 SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
+--error ER_GET_ERRNO
 CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
 SHOW WARNINGS;
 SET GLOBAL innodb_file_format = `Barracuda`;

No bundle (reason: useless for push emails).