List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 19 2012 9:26am
Subject:bzr push into mysql-trunk branch (marko.makela:4014 to 4015)
View as plain text  
 4015 Marko Mäkelä	2012-06-19
      ib_senderrf(): Remove InnoDB: prefix from client error messages.
      
      Approved by Sunny Bains on IM.

    modified:
      mysql-test/suite/innodb/r/innodb-wl5522-1.result
      mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result
      mysql-test/suite/innodb/r/innodb-wl5522-debug.result
      mysql-test/suite/innodb/r/innodb-wl5522-zip.result
      mysql-test/suite/innodb/r/innodb-wl5522.result
      mysql-test/suite/innodb/r/innodb-wl5980-discard.result
      mysql-test/suite/innodb/r/innodb_bug14169459.result
      storage/innobase/handler/ha_innodb.cc
 4014 Harin Vadodaria	2012-06-19 [merge]
      Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST
                    INC_HOST_ERRORS() IS CALLED.
                  
      Description: Null merge from MySQL 5.5 to MySQL Trunk

=== modified file 'mysql-test/suite/innodb/r/innodb-wl5522-1.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5522-1.result	revid:harin.vadodaria@strippeddha
+++ b/mysql-test/suite/innodb/r/innodb-wl5522-1.result	revid:marko.makela@strippedi3vlj3
@@ -401,7 +401,7 @@ CREATE TABLE testdb_wl5522.t1 ( i bigint
 ALTER TABLE testdb_wl5522.t1 DISCARD TABLESPACE;
 restore: t1
 ALTER TABLE testdb_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Column i precise type mismatch.)
+ERROR HY000: Schema mismatch (Column i precise type mismatch.)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE testdb_wl5522.t1;
@@ -410,7 +410,7 @@ ALTER TABLE testdb_wl5522.t1 DISCARD TAB
 restore: t1
 ALTER TABLE testdb_wl5522.t1 IMPORT TABLESPACE;
 ALTER TABLE testdb_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Tablespace for table 't1' exists. Please DISCARD the tablespace before IMPORT.
+ERROR HY000: Tablespace for table 't1' exists. Please DISCARD the tablespace before IMPORT.
 SELECT * FROM testdb_wl5522.t1 ORDER BY i;
 i
 100

=== modified file 'mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result	revid:harin.vadodaria@stripped-20120619091750-j6u285p11y0uxdha
+++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result	revid:marko.makela@oracle.com-20120619092503-bp19a0nj3zi3vlj3
@@ -26,17 +26,17 @@ ROW_FORMAT=COMPRESSED;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_before_commit_crash";
 SELECT * FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
 ERROR HY000: Lost connection to MySQL server during query
 SET SESSION debug="-d,ib_import_before_commit_crash";
 SET SESSION debug="+d,ib_import_before_checkpoint_crash";
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
 ERROR HY000: Lost connection to MySQL server during query
 SET SESSION debug="-d,ib_import_before_checkpoint_crash";
@@ -224,10 +224,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_1";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_1";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -235,10 +235,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_2";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_2";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -246,10 +246,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_3";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_3";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -257,10 +257,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_4";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_4";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -268,10 +268,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_5";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_5";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -279,10 +279,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_6";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_6";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -290,10 +290,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_7";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_7";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -301,10 +301,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_8";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_8";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -312,10 +312,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_9";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_9";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -323,10 +323,10 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_10";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_10";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb
@@ -334,7 +334,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_1";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -348,7 +348,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_2";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -362,7 +362,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_4";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -376,7 +376,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_5";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -390,7 +390,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_6";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -404,7 +404,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_7";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -418,7 +418,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_8";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -432,7 +432,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_9";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -446,7 +446,7 @@ ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_10";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -459,11 +459,11 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_internal_error";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: While updating the <space, root page number> of index "GEN_CLUST_INDEX" - Generic error
+ERROR HY000: Internal error: While updating the <space, root page number> of index "GEN_CLUST_INDEX" - Generic error
 SET SESSION debug="-d,ib_import_internal_error";
 restore: t1
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -472,16 +472,16 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_reset_space_and_lsn_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Too many concurrent transactions
+ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Too many concurrent transactions
 restore: t1
 SET SESSION debug="-d,ib_import_reset_space_and_lsn_failure";
 SET SESSION debug="+d,ib_import_open_tablespace_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Can't find 't1.ibd' (errno: 44 - Tablespace not found)
+ERROR HY000: Can't find 't1.ibd' (errno: 44 - Tablespace not found)
 SET SESSION debug="-d,ib_import_open_tablespace_failure";
 restore: t1
 SET SESSION debug="+d,ib_import_check_bitmap_failure";
@@ -846,11 +846,11 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_trigger_corruption_1";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Data structure corruption
+ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Data structure corruption
 SET SESSION debug="-d,ib_import_trigger_corruption_1";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -859,7 +859,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,buf_page_is_corrupt_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -871,11 +871,11 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_trigger_corruption_2";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Index corrupt: Externally stored column(5) has a reference length of 19 in the cluster index "GEN_CLUST_INDEX"
+ERROR HY000: Index corrupt: Externally stored column(5) has a reference length of 19 in the cluster index "GEN_CLUST_INDEX"
 SET SESSION debug="-d,ib_import_trigger_corruption_2";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -884,7 +884,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_trigger_corruption_3";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -897,7 +897,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_create_index_failure_1";
 ALTER TABLE test_wl5522.t1 ADD INDEX idx(c1);
 Warnings:
@@ -910,11 +910,11 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,fil_space_create_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Can't find file: 'test_wl5522\t1.ibd' (errno: 11 - Generic error)
+ERROR HY000: Can't find file: 'test_wl5522\t1.ibd' (errno: 11 - Generic error)
 SET SESSION debug="-d,fil_space_create_failure";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -923,11 +923,11 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,dict_tf_to_fsp_flags_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Can't find file: 'test_wl5522\t1.ibd' (errno: 39 - Data structure corruption)
+ERROR HY000: Can't find file: 'test_wl5522\t1.ibd' (errno: 39 - Data structure corruption)
 SET SESSION debug="-d,dict_tf_to_fsp_flags_failure";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -936,11 +936,11 @@ CREATE TABLE test_wl5522.t1 (c1 INT, c2
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,fsp_flags_is_valid_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Unsupported
+ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Unsupported
 SET SESSION debug="-d,fsp_flags_is_valid_failure";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd

=== modified file 'mysql-test/suite/innodb/r/innodb-wl5522-debug.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result	revid:harin.vadodaria@oracle.com-20120619091750-j6u285p11y0uxdha
+++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result	revid:marko.makela@oracle.com-20120619092503-bp19a0nj3zi3vlj3
@@ -16,17 +16,17 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_before_commit_crash";
 SELECT * FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
 ERROR HY000: Lost connection to MySQL server during query
 SET SESSION debug="-d,ib_import_before_commit_crash";
 SET SESSION debug="+d,ib_import_before_checkpoint_crash";
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
 ERROR HY000: Lost connection to MySQL server during query
 SET SESSION debug="-d,ib_import_before_checkpoint_crash";
@@ -191,107 +191,107 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_1";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_1";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_2";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_2";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_3";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_3";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_4";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_4";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_5";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_5";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_6";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_6";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_7";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_7";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_8";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_8";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_9";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_9";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_io_read_error_10";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
+ERROR HY000: IO Read error: (2, No such file or directory) Error opening 't1.cfg'
 SET SESSION debug="-d,ib_import_io_read_error_10";
 DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_1";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -304,7 +304,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_2";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -319,7 +319,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_4";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -332,7 +332,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_5";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -345,7 +345,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_6";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -358,7 +358,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_7";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -371,7 +371,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_8";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -384,7 +384,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_9";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -397,7 +397,7 @@ CREATE TABLE test_wl5522.t1 (c1 INT) ENG
 INSERT INTO test_wl5522.t1 VALUES (1);
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_OOM_10";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -409,11 +409,11 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_internal_error";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: While updating the <space, root page number> of index "GEN_CLUST_INDEX" - Generic error
+ERROR HY000: Internal error: While updating the <space, root page number> of index "GEN_CLUST_INDEX" - Generic error
 SET SESSION debug="-d,ib_import_internal_error";
 restore: t1
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -421,16 +421,16 @@ DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_reset_space_and_lsn_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Too many concurrent transactions
+ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Too many concurrent transactions
 restore: t1
 SET SESSION debug="-d,ib_import_reset_space_and_lsn_failure";
 SET SESSION debug="+d,ib_import_open_tablespace_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Can't find 't1.ibd' (errno: 44 - Tablespace not found)
+ERROR HY000: Can't find 't1.ibd' (errno: 44 - Tablespace not found)
 SET SESSION debug="-d,ib_import_open_tablespace_failure";
 restore: t1
 SET SESSION debug="+d,ib_import_check_bitmap_failure";
@@ -791,11 +791,11 @@ DROP TABLE test_wl5522.t1;
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_trigger_corruption_1";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Data structure corruption
+ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Data structure corruption
 SET SESSION debug="-d,ib_import_trigger_corruption_1";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -803,11 +803,11 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,buf_page_is_corrupt_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Data structure corruption
+ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Data structure corruption
 SET SESSION debug="-d,buf_page_is_corrupt_failure";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -815,11 +815,11 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_trigger_corruption_2";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Index corrupt: Externally stored column(5) has a reference length of 19 in the cluster index "GEN_CLUST_INDEX"
+ERROR HY000: Index corrupt: Externally stored column(5) has a reference length of 19 in the cluster index "GEN_CLUST_INDEX"
 SET SESSION debug="-d,ib_import_trigger_corruption_2";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -827,7 +827,7 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,ib_import_trigger_corruption_3";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
@@ -839,7 +839,7 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 SET SESSION debug="+d,ib_import_create_index_failure_1";
 ALTER TABLE test_wl5522.t1 ADD INDEX idx(c1);
 Warnings:
@@ -851,11 +851,11 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,fil_space_create_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Can't find file: 'test_wl5522\t1.ibd' (errno: 11 - Generic error)
+ERROR HY000: Can't find file: 'test_wl5522\t1.ibd' (errno: 11 - Generic error)
 SET SESSION debug="-d,fil_space_create_failure";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -863,11 +863,11 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,dict_tf_to_fsp_flags_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Can't find file: 'test_wl5522\t1.ibd' (errno: 39 - Data structure corruption)
+ERROR HY000: Can't find file: 'test_wl5522\t1.ibd' (errno: 39 - Data structure corruption)
 SET SESSION debug="-d,dict_tf_to_fsp_flags_failure";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -875,11 +875,11 @@ unlink: t1.cfg
 CREATE TABLE test_wl5522.t1 (c1 INT, c2 VARCHAR(1024), c3 BLOB) ENGINE = Innodb;
 ALTER TABLE test_wl5522.t1 DISCARD TABLESPACE;
 SELECT COUNT(*) FROM test_wl5522.t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 SET SESSION debug="+d,fsp_flags_is_valid_failure";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Unsupported
+ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Unsupported
 SET SESSION debug="-d,fsp_flags_is_valid_failure";
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd

=== modified file 'mysql-test/suite/innodb/r/innodb-wl5522-zip.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5522-zip.result	revid:harin.vadodaria@strippedu285p11y0uxdha
+++ b/mysql-test/suite/innodb/r/innodb-wl5522-zip.result	revid:marko.makela@stripped03-bp19a0nj3zi3vlj3
@@ -123,7 +123,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT) ENGINE=InnoDB  ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO t1(c2) VALUES(1);
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Tablespace for table 't1' exists. Please DISCARD the tablespace before IMPORT.
+ERROR HY000: Tablespace for table 't1' exists. Please DISCARD the tablespace before IMPORT.
 SELECT * FROM t1;
 c1	c2
 1	1
@@ -153,7 +153,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT) ENGINE=InnoDB  ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 t1.cfg
 t1.frm
@@ -195,7 +195,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT) ENGINE=InnoDB  ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 t1.cfg
 t1.frm
@@ -235,7 +235,7 @@ c2 INT, INDEX(c2)) ENGINE=InnoDB
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;
@@ -269,10 +269,10 @@ c2 INT, INDEX x(c2)) ENGINE=InnoDB
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Index x not found in tablespace meta-data file.)
+ERROR HY000: Schema mismatch (Index x not found in tablespace meta-data file.)
 ALTER TABLE t1 DROP INDEX x;
 Warnings:
 Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
@@ -391,10 +391,10 @@ c2 INT) ENGINE=InnoDB
 ROW_FORMAT=COMPRESSED;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Number of indexes don't match, table has 1 indexes but the tablespace meta-data file has 2 indexes)
+ERROR HY000: Schema mismatch (Number of indexes don't match, table has 1 indexes but the tablespace meta-data file has 2 indexes)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -405,10 +405,10 @@ c3 INT, INDEX idx(c2)) ENGINE=InnoDB
 ROW_FORMAT=COMPRESSED;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Number of columns don't match, table has 6 columns but the tablespace meta-data file has 5 columns)
+ERROR HY000: Schema mismatch (Number of columns don't match, table has 6 columns but the tablespace meta-data file has 5 columns)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -418,10 +418,10 @@ c2 BIGINT, INDEX idx(c2)) ENGINE=InnoDB
 ROW_FORMAT=COMPRESSED;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Column c2 precise type mismatch.)
+ERROR HY000: Schema mismatch (Column c2 precise type mismatch.)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -431,10 +431,10 @@ c2 INT, INDEX idx(c2)) ENGINE=InnoDB
 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch 
+ERROR HY000: Schema mismatch 
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -444,7 +444,7 @@ c2 INT, INDEX idx(c2)) ENGINE=InnoDB
 ROW_FORMAT=COMPRESSED;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;

=== modified file 'mysql-test/suite/innodb/r/innodb-wl5522.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5522.result	revid:harin.vadodaria@stripped9091750-j6u285p11y0uxdha
+++ b/mysql-test/suite/innodb/r/innodb-wl5522.result	revid:marko.makela@stripped19092503-bp19a0nj3zi3vlj3
@@ -115,7 +115,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT) ENGINE=InnoDB;
 INSERT INTO t1(c2) VALUES(1);
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Tablespace for table 't1' exists. Please DISCARD the tablespace before IMPORT.
+ERROR HY000: Tablespace for table 't1' exists. Please DISCARD the tablespace before IMPORT.
 SELECT * FROM t1;
 c1	c2
 1	1
@@ -145,7 +145,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 t1.cfg
 t1.frm
@@ -187,7 +187,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 t1.cfg
 t1.frm
@@ -225,7 +225,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX(c2)) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;
@@ -257,10 +257,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX x(c2)) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Index x not found in tablespace meta-data file.)
+ERROR HY000: Schema mismatch (Index x not found in tablespace meta-data file.)
 ALTER TABLE t1 DROP INDEX x;
 Warnings:
 Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
@@ -377,10 +377,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Number of indexes don't match, table has 1 indexes but the tablespace meta-data file has 2 indexes)
+ERROR HY000: Schema mismatch (Number of indexes don't match, table has 1 indexes but the tablespace meta-data file has 2 indexes)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -390,10 +390,10 @@ c2 INT,
 c3 INT, INDEX idx(c2)) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Number of columns don't match, table has 6 columns but the tablespace meta-data file has 5 columns)
+ERROR HY000: Schema mismatch (Number of columns don't match, table has 6 columns but the tablespace meta-data file has 5 columns)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -402,10 +402,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 BIGINT, INDEX idx(c2)) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Column c2 precise type mismatch.)
+ERROR HY000: Schema mismatch (Column c2 precise type mismatch.)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -414,7 +414,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;
@@ -524,7 +524,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;
@@ -579,10 +579,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=COMPACT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -591,10 +591,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -603,7 +603,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 unlink: t1.cfg
@@ -710,7 +710,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=COMPACT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;
@@ -765,10 +765,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -777,10 +777,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -789,7 +789,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=COMPACT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;
@@ -899,7 +899,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;
@@ -954,10 +954,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=COMPACT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -966,10 +966,10 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -978,7 +978,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY K
 c2 INT, INDEX idx(c2)) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1
 ALTER TABLE t1 IMPORT TABLESPACE;
 CHECK TABLE t1;

=== modified file 'mysql-test/suite/innodb/r/innodb-wl5980-discard.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5980-discard.result	revid:harin.vadodaria@stripped
+++ b/mysql-test/suite/innodb/r/innodb-wl5980-discard.result	revid:marko.makela@strippedzi3vlj3
@@ -116,7 +116,7 @@ a	b
 #
 ALTER TABLE t5980 DISCARD TABLESPACE;
 SELECT * FROM t5980;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't5980'
+ERROR HY000: Tablespace has been discarded for table 't5980'
 ### files in MYSQL_DATA_DIR/test
 t5980.frm
 t5980.isl
@@ -140,10 +140,10 @@ t5980.ibd.bak2
 # do not match the current frm file.
 #
 ALTER TABLE t5980 IMPORT TABLESPACE;
-ERROR HY000: InnoDB: Schema mismatch (Number of columns don't match, table has 5 columns but the tablespace meta-data file has 6 columns)
+ERROR HY000: Schema mismatch (Number of columns don't match, table has 5 columns but the tablespace meta-data file has 6 columns)
 CHECK TABLE t5980;
 Table	Op	Msg_type	Msg_text
-test.t5980	check	Error	InnoDB: Tablespace has been discarded for table 't5980'
+test.t5980	check	Error	Tablespace has been discarded for table 't5980'
 test.t5980	check	error	Corrupt
 ### files in MYSQL_TMP_DIR/alt_dir/test
 t5980.cfg.bak
@@ -301,7 +301,7 @@ t5980.ibd.bak
 t5980.ibd.bak2
 ALTER TABLE t5980 DISCARD TABLESPACE;
 SELECT * FROM t5980;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't5980'
+ERROR HY000: Tablespace has been discarded for table 't5980'
 ### files in MYSQL_DATA_DIR/test
 t5980.frm
 t5980.isl
@@ -352,7 +352,7 @@ t5980.ibd.bak2
 #
 ALTER TABLE t5980 DISCARD TABLESPACE;
 SELECT * FROM t5980;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't5980'
+ERROR HY000: Tablespace has been discarded for table 't5980'
 ### files in MYSQL_DATA_DIR/test
 t5980.frm
 t5980.isl
@@ -366,10 +366,10 @@ t5980.ibd.bak2
 #
 SET GLOBAL innodb_file_per_table=ON;
 SELECT * FROM t5980;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't5980'
+ERROR HY000: Tablespace has been discarded for table 't5980'
 CHECK TABLE t5980;
 Table	Op	Msg_type	Msg_text
-test.t5980	check	Error	InnoDB: Tablespace has been discarded for table 't5980'
+test.t5980	check	Error	Tablespace has been discarded for table 't5980'
 test.t5980	check	error	Corrupt
 #
 # Relocate this discarded file to the default directory
@@ -391,10 +391,10 @@ t5980.ibd.bak2
 # Restarting ...
 SET GLOBAL innodb_file_per_table=ON;
 SELECT * FROM t5980;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't5980'
+ERROR HY000: Tablespace has been discarded for table 't5980'
 CHECK TABLE t5980;
 Table	Op	Msg_type	Msg_text
-test.t5980	check	Error	InnoDB: Tablespace has been discarded for table 't5980'
+test.t5980	check	Error	Tablespace has been discarded for table 't5980'
 test.t5980	check	error	Corrupt
 #
 # Try to import the tablespace.  It can only be imported from
@@ -404,10 +404,10 @@ test.t5980	check	error	Corrupt
 #
 ALTER TABLE t5980 IMPORT TABLESPACE;
 SELECT * FROM t5980;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't5980'
+ERROR HY000: Tablespace has been discarded for table 't5980'
 CHECK TABLE t5980;
 Table	Op	Msg_type	Msg_text
-test.t5980	check	Error	InnoDB: Tablespace has been discarded for table 't5980'
+test.t5980	check	Error	Tablespace has been discarded for table 't5980'
 test.t5980	check	error	Corrupt
 #
 # Restore the ibd and cfg files to the remote directory.

=== modified file 'mysql-test/suite/innodb/r/innodb_bug14169459.result'
--- a/mysql-test/suite/innodb/r/innodb_bug14169459.result	revid:harin.vadodaria@oracle.com-20120619091750-j6u285p11y0uxdha
+++ b/mysql-test/suite/innodb/r/innodb_bug14169459.result	revid:marko.makela@stripped
@@ -44,7 +44,7 @@ t14169459_2.frm
 t14169459_2.ibd
 ALTER TABLE t14169459_2 DISCARD TABLESPACE;
 SELECT * FROM t14169459_2;
-ERROR HY000: InnoDB: Tablespace has been discarded for table 't14169459_2'
+ERROR HY000: Tablespace has been discarded for table 't14169459_2'
 ### directory of MYSQL_DATA_DIR/test
 t14169459_2.frm
 ### directory of MYSQL_TMP_DIR/mysqld.1

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:harin.vadodaria@stripped5p11y0uxdha
+++ b/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@strippedlj3
@@ -16286,7 +16286,7 @@ ib_senderrf(
 		/* Set l, to avoid a compiler warning. */
 		l = Sql_condition::WARN_LEVEL_ERROR;
 		/* We can't use push_warning_printf(), it is a hard error. */
-		my_printf_error(code, "InnoDB: %s", MYF(0), str);
+		my_printf_error(code, "%s", MYF(0), str);
 		break;
 	case IB_LOG_LEVEL_FATAL:
 		l = Sql_condition::WARN_LEVEL_END;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:4014 to 4015) marko.makela19 Jun