innodb suite wl6445

3c388c3f · Alice Sherepa · 59fcbf72 · 3c388c3f · 3c388c3f · 3c388c3f
Commit 3c388c3f authored Oct 02, 2017 by Alice Sherepa
8 changed files
--- a/mysql-test/suite/innodb/r/innodb-log-file-size-1.result
+++ b/mysql-test/suite/innodb/r/innodb-log-file-size-1.result
+call mtr.add_suppression("InnoDB: Resizing redo log");
+call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
+call mtr.add_suppression("InnoDB: New log files created");
+call mtr.add_suppression("InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles");
+SET GLOBAL innodb_file_per_table = 1;
+SELECT @@innodb_file_per_table;
+@@innodb_file_per_table
+1
+SET GLOBAL innodb_file_format = `Barracuda`;
+SELECT @@innodb_file_format;
+@@innodb_file_format
+Barracuda
+SELECT @@innodb_log_file_size;
+@@innodb_log_file_size
+1048576
+SELECT @@innodb_log_files_in_group;
+@@innodb_log_files_in_group
+2
+DROP DATABASE IF EXISTS db_wl6494;
+CREATE DATABASE db_wl6494;
+USE db_wl6494;
+CREATE TABLE t1(id INT PRIMARY KEY,bfield blob) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,repeat('a',2000)),(2,repeat('b',2000)),
+(3,repeat('c',2000));
+START TRANSACTION;
+INSERT INTO t1 VALUES (11,repeat('a',2000)),(12,repeat('b',2000)),
+(13,repeat('c',2000));
+SAVEPOINT A;
+INSERT INTO t1 VALUES (21,repeat('a',2000)),(22,repeat('b',2000)),
+(23,repeat('c',2000));
+SAVEPOINT B;
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+21	aaaaaaaaaaaaaaaaaaaa
+22	bbbbbbbbbbbbbbbbbbbb
+23	cccccccccccccccccccc
+ROLLBACK TO A;
+COMMIT;
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+FOUND /InnoDB: Starting crash recovery/ in case1.err
+The size of the ib_logfile0 file: 2 
+The size of the ib_logfile1 file: 2 
+The size of the ib_logfile2 file: 2 
+The size of the ib_logfile3 file: 2 
+The size of the ib_logfile4 file: 2 
+USE db_wl6494;
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+INSERT INTO t1 VALUES (1,repeat('a',2000)),(2,repeat('b',2000)),
+(3,repeat('c',2000));
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+INSERT INTO t1 VALUES (21,repeat('a',2000)),(22,repeat('b',2000)),
+(23,repeat('c',2000));
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+21	aaaaaaaaaaaaaaaaaaaa
+22	bbbbbbbbbbbbbbbbbbbb
+23	cccccccccccccccccccc
+DROP TABLE t1;
+DROP DATABASE db_wl6494;
+SELECT @@innodb_log_file_size;
+@@innodb_log_file_size
+3145728
+SELECT @@innodb_log_files_in_group;
+@@innodb_log_files_in_group
+3
+DROP DATABASE IF EXISTS db_wl6494;
+CREATE DATABASE db_wl6494;
+USE db_wl6494;
+CREATE TABLE t1(id INT PRIMARY KEY,bfield blob) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,repeat('a',2000)),(2,repeat('b',2000)),
+(3,repeat('c',2000));
+START TRANSACTION;
+INSERT INTO t1 VALUES (11,repeat('a',2000)),(12,repeat('b',2000)),
+(13,repeat('c',2000));
+SAVEPOINT A;
+INSERT INTO t1 VALUES (21,repeat('a',2000)),(22,repeat('b',2000)),
+(23,repeat('c',2000));
+SAVEPOINT B;
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+21	aaaaaaaaaaaaaaaaaaaa
+22	bbbbbbbbbbbbbbbbbbbb
+23	cccccccccccccccccccc
+ROLLBACK TO A;
+COMMIT;
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+SELECT @@innodb_log_file_size;
+@@innodb_log_file_size
+2097152
+SELECT @@innodb_log_files_in_group;
+@@innodb_log_files_in_group
+2
+FOUND /InnoDB: Starting crash recovery/ in case2.err
+USE db_wl6494;
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+INSERT INTO t1 VALUES (1,repeat('a',2000)),(2,repeat('b',2000)),
+(3,repeat('c',2000));
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+INSERT INTO t1 VALUES (21,repeat('a',2000)),(22,repeat('b',2000)),
+(23,repeat('c',2000));
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+21	aaaaaaaaaaaaaaaaaaaa
+22	bbbbbbbbbbbbbbbbbbbb
+23	cccccccccccccccccccc
+SET GLOBAL innodb_fast_shutdown=0;
+"test misc 1"
+NOT FOUND /syntax error in innodb_log_group_home_dir/ in my_restart.err
+"test misc 2"
+NOT FOUND /innodb_mirrored_log_groups is an unimplemented feature and the variable will be completely removed in a future version. Using values other than 1 is not supported./ in my_restart.err
+"test misc 3"
+NOT FOUND /InnoDB: Cannot resize log files in read-only mode/ in my_restart.err
+"test misc 4"
+NOT FOUND /InnoDB: Only one log file found/ in my_restart.err
+"test misc 5"
+NOT FOUND /InnoDB: .*ib_logfile0 size 7 is not a multiple of innodb_page_size/ in my_restart.err
+"test misc 6"
+NOT FOUND /InnoDB: .*ib_logfile1 is of different size/ in my_restart.err
+USE db_wl6494;
+SELECT id,LEFT(bfield,20) FROM t1;
+id	LEFT(bfield,20)
+1	aaaaaaaaaaaaaaaaaaaa
+2	bbbbbbbbbbbbbbbbbbbb
+3	cccccccccccccccccccc
+11	aaaaaaaaaaaaaaaaaaaa
+12	bbbbbbbbbbbbbbbbbbbb
+13	cccccccccccccccccccc
+21	aaaaaaaaaaaaaaaaaaaa
+22	bbbbbbbbbbbbbbbbbbbb
+23	cccccccccccccccccccc
+INSERT INTO t1 VALUES (1,repeat('a',2000)),(2,repeat('b',2000)),
+(3,repeat('c',2000));
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+DROP TABLE t1;
+DROP DATABASE db_wl6494;
--- a/mysql-test/suite/innodb/r/innodb-wl6445-2.result
+++ b/mysql-test/suite/innodb/r/innodb-wl6445-2.result
@@ -30,23 +30,23 @@ i
 2
 3
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 i	LEFT(j,20)
 1	aaaaaaaaaaaaaaaaaaaa
 2	bbbbbbbbbbbbbbbbbbbb
 3	cccccccccccccccccccc
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 i	LEFT(j,20)
 1	aaaaaaaaaaaaaaaaaaaa
 2	bbbbbbbbbbbbbbbbbbbb
 3	cccccccccccccccccccc
 CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb;
-ERROR HY000: InnoDB is in read only mode.
+ERROR HY000: Can't create table `testdb_wl6445`.`t2` (errno: 165 "Table is read only")
 UPDATE t1 SET i = i+1;
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 FLUSH STATUS;
 FLUSH LOGS;
 FLUSH TABLES t1;
@@ -94,14 +94,14 @@ i
 SELECT i FROM t2 ORDER BY i;
 i
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 i	LEFT(j,20)
 1	aaaaaaaaaaaaaaaaaaaa
 2	bbbbbbbbbbbbbbbbbbbb
 3	cccccccccccccccccccc
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 i	LEFT(j,20)
 1	aaaaaaaaaaaaaaaaaaaa
@@ -110,9 +110,9 @@ i	LEFT(j,20)
 CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb;
 ERROR 42S01: Table 't2' already exists
 CREATE TABLE t3 ( i int , j blob) ENGINE = Innodb;
-ERROR HY000: InnoDB is in read only mode.
+ERROR HY000: Can't create table `testdb_wl6445`.`t3` (errno: 165 "Table is read only")
 UPDATE t1 SET i = i+1;
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 FLUSH STATUS;
 FLUSH LOGS;
 FLUSH TABLES t1,t2;
@@ -122,6 +122,7 @@ case # 3
 #    Try to restart the server without --innodb-read-only after removing
 #    write permissions of system tablespace. Server should not start.
 #    This confirms server is not automatically started in read-only mode.
+NOT FOUND /InnoDB: The system tablespace must be writable/ in my_restart.err
 USE testdb_wl6445;
 DROP DATABASE testdb_wl6445;
 SET GLOBAL INNODB_FILE_FORMAT=Antelope;

--- a/mysql-test/suite/innodb/r/innodb-wl6445.result
+++ b/mysql-test/suite/innodb/r/innodb-wl6445.result
@@ -16,29 +16,29 @@ SELECT COUNT(*) FROM WL6445.t1;
 COUNT(*)
 3
 INSERT INTO WL6445.t1 VALUES(3,3);
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 INSERT INTO WL6445.t1 SELECT * FROM WL6445.t1;
 ERROR HY000: Table 't1' is read only
 REPLACE INTO WL6445.t1 VALUES(1,1);
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 UPDATE WL6445.t1 SET c1 = c1 + 100;
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 DELETE FROM WL6445.t1;
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 ALTER TABLE WL6445.t1 ADD COLUMN c2 INT;
 ERROR 42S21: Duplicate column name 'c2'
 ALTER TABLE WL6445.t1 ADD UNIQUE INDEX(c1);
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 ALTER TABLE WL6445.t1 DROP INDEX sec_idx;
-ERROR HY000: Can't lock file (errno: 165 - Table is read only)
+ERROR HY000: Table 't1' is read only
 DROP TABLE WL6445.t1;
-ERROR 42S02: Unknown table 'WL6445.t1'
+ERROR HY000: Table 't1' is read only
 TRUNCATE TABLE WL6445.t1;
 ERROR HY000: Table 't1' is read only
 RENAME TABLE WL6445.t1 TO WL6444.t2;
-ERROR HY000: Error on rename of 't1' to 't2' (errno: 165 - Table is read only)
+ERROR HY000: Error on rename of 't1' to 't2' (errno: 165 "Table is read only")
 DROP DATABASE WL6445;
-ERROR 42S02: Unknown table 'WL6445.t1'
+ERROR HY000: Table 't1' is read only
 SHOW CREATE TABLE WL6445.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

--- a/mysql-test/suite/innodb/t/innodb-log-file-size-1.test
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size-1.test
@@ -195,7 +195,7 @@ SELECT id,LEFT(bfield,20) FROM t1;
 # testcase misc
 let MYSQLD_DATADIR= `select @@datadir`;
 let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
-let $args=--loose-console > $SEARCH_FILE 2>&1;
+let $args=--loose-console --default-storage-engine=innodb > $SEARCH_FILE 2>&1;

 # Stop the server
 SET GLOBAL innodb_fast_shutdown=0;
@@ -206,21 +206,21 @@ let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;

 --echo "test misc 1"
 --error 1
--exec $MYSQLD_CMD $args --innodb-log-group-home-dir=foo\;bar
+--exec $MYSQLD_CMD $args --innodb-log-group-home-dir=foo\;bar 
 let SEARCH_PATTERN= syntax error in innodb_log_group_home_dir;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE

 --echo "test misc 2"
 --error 1
--exec $MYSQLD_CMD $args --innodb-mirrored-log-groups=2
+--exec $MYSQLD_CMD $args --innodb-mirrored-log-groups=2 
 let SEARCH_PATTERN= innodb_mirrored_log_groups is an unimplemented feature and the variable will be completely removed in a future version. Using values other than 1 is not supported.;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE

 --echo "test misc 3"
 --error 1
--exec $MYSQLD_CMD $args --innodb-read-only
+--exec $MYSQLD_CMD $args --innodb-read-only 
 let SEARCH_PATTERN= InnoDB: Cannot resize log files in read-only mode;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE

--- a/mysql-test/suite/innodb/t/innodb-log-file-size.test
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size.test
@@ -51,7 +51,7 @@ INSERT INTO t1 VALUES (123);

 let MYSQLD_DATADIR= `select @@datadir`;
 let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
-let $args=--loose-console > $SEARCH_FILE 2>&1;
+let $args=--loose-console --default-storage-engine=innodb > $SEARCH_FILE 2>&1;
 let crash=$args --innodb-force-recovery-crash;

 SET DEBUG='+d,crash_commit_before';
@@ -74,18 +74,18 @@ let SEARCH_PATTERN= innodb_mirrored_log_groups is an unimplemented feature and t

 # On Windows, DBUG_SUICIDE() does exit(3) instead of SIGKILL (128+9).
 --echo --innodb-force-recovery-crash=1
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=1
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=2
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=2
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 --echo --innodb-force-recovery-crash=3
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=3
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -100,7 +100,7 @@ let SEARCH_PATTERN= InnoDB: Can.t initiate database recovery, running in read-on
 --remove_file $SEARCH_FILE

 --echo --innodb-force-recovery-crash=4
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=4
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -108,7 +108,7 @@ let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=5
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=5
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -123,7 +123,7 @@ let SEARCH_PATTERN= InnoDB: Can.t initiate database recovery, running in read-on
 --remove_file $SEARCH_FILE

 --echo --innodb-force-recovery-crash=6
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=6
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
@@ -131,7 +131,7 @@ let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=7
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=7
 # this crashes right after deleting all log files
 --remove_file $SEARCH_FILE
@@ -143,13 +143,13 @@ let SEARCH_PATTERN= InnoDB: Cannot create log files in read-only mode;
 --remove_file $SEARCH_FILE

 --echo --innodb-force-recovery-crash=8
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=8
 let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=9
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=9
 let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc
@@ -195,7 +195,7 @@ let SEARCH_PATTERN= InnoDB: Log file .*ib_logfile1 is of different size 1048576
 --move_file $MYSQLD_DATADIR/ib_logfile1_hidden $MYSQLD_DATADIR/ib_logfile1

 --echo --innodb-force-recovery-crash=10
--error 3
+--error 7
 --exec $MYSQLD_CMD $crash=10
 let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc

--- a/mysql-test/suite/innodb/t/innodb-wl6445-1.test
+++ b/mysql-test/suite/innodb/t/innodb-wl6445-1.test
@@ -16,8 +16,8 @@
 --source include/not_valgrind.inc
 # Not supported in embedded
 --source include/not_embedded.inc
-
 -- source include/have_innodb.inc
+--source include/have_partition.inc


 let MYSQLD_DATADIR =`SELECT @@datadir`;
@@ -94,7 +94,7 @@ GRANT ALL ON testdb_wl6445.* TO 'test3'@'localhost';

 USE testdb_wl6445;
 SELECT i FROM t1 ORDER BY i;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;

@@ -102,12 +102,12 @@ SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 --connect (con_test1_user,'localhost','test1','123',)
 SELECT user();
 USE testdb_wl6445;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TABLE t2 ( i int ,j blob) ENGINE = Innodb;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i+1;

 --echo # disconnect con_test1_user
@@ -118,12 +118,12 @@ UPDATE t1 SET i = i+1;
 --connect (con_test2_user,'localhost','test2','123',)
 SELECT user();
 USE testdb_wl6445;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i+1;
 # Fix in next revision - known ( no data returned)
 #SHOW ENGINE INNODB STATUS;
@@ -141,16 +141,16 @@ UNLOCK TABLES;
 --echo # connection default
 --connection default
 USE testdb_wl6445;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i+1;

 # check with table having data and index directory specified
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO otherlocation VALUES (1),(2),(3);
 SELECT * FROM otherlocation ORDER BY id;

@@ -242,12 +242,12 @@ SELECT COUNT(*) FROM testdb_wl6445.t1;
 --source include/wait_until_connected_again.inc

 USE testdb_wl6445;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (211,repeat('a',200)),(212,repeat('b',200)),(213,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 WHERE i%10=0 ORDER BY i;
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i+1;

 SELECT i,LEFT(j,20) FROM t1  WHERE i%10=0  ORDER BY i;
@@ -258,11 +258,11 @@ SET GLOBAL innodb_flush_log_at_trx_commit = 0;
 let $counter= 200;
 --disable_query_log
 while ($counter>150) {
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   EVAL INSERT INTO testdb_wl6445.t1 VALUES ($counter,repeat(CONCAT('a',$counter),2000));
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   UPDATE testdb_wl6445.t1 SET i = i + 1;
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   DELETE FROM testdb_wl6445.t1;
   --dec $counter
 }
@@ -271,11 +271,11 @@ SAVEPOINT A;
 let $counter= 250;
 --disable_query_log
 while ($counter>200) {
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   EVAL INSERT INTO testdb_wl6445.t1 VALUES ($counter,repeat(CONCAT('a',$counter),2000));
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   UPDATE testdb_wl6445.t1 SET i = i + 1;
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   DELETE FROM testdb_wl6445.t1;
   --dec $counter
 }
@@ -293,11 +293,11 @@ SET GLOBAL innodb_flush_log_at_trx_commit = 1;
 let $counter= 200;
 --disable_query_log
 while ($counter>150) {
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   EVAL INSERT INTO testdb_wl6445.t1 VALUES ($counter,repeat(CONCAT('a',$counter),2000));
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   UPDATE testdb_wl6445.t1 SET i = i + 1;
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   DELETE FROM testdb_wl6445.t1;
   --dec $counter
 }
@@ -306,11 +306,11 @@ SAVEPOINT A;
 let $counter= 250;
 --disable_query_log
 while ($counter>200) {
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   EVAL INSERT INTO testdb_wl6445.t1 VALUES ($counter,repeat(CONCAT('a',$counter),2000));
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   UPDATE testdb_wl6445.t1 SET i = i + 1;
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   DELETE FROM testdb_wl6445.t1;
   --dec $counter
 }
@@ -328,11 +328,11 @@ SET GLOBAL innodb_flush_log_at_trx_commit = 2;
 let $counter= 200;
 --disable_query_log
 while ($counter>150) {
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   EVAL INSERT INTO testdb_wl6445.t1 VALUES ($counter,repeat(CONCAT('a',$counter),2000));
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   UPDATE testdb_wl6445.t1 SET i = i + 1;
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   DELETE FROM testdb_wl6445.t1;
   --dec $counter
 }
@@ -341,11 +341,11 @@ SAVEPOINT A;
 let $counter= 250;
 --disable_query_log
 while ($counter>200) {
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   EVAL INSERT INTO testdb_wl6445.t1 VALUES ($counter,repeat(CONCAT('a',$counter),2000));
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   UPDATE testdb_wl6445.t1 SET i = i + 1;
-   --ERROR ER_CANT_LOCK
+   --ERROR ER_OPEN_AS_READONLY
   DELETE FROM testdb_wl6445.t1;
   --dec $counter
 }
@@ -446,22 +446,22 @@ SELECT * FROM t3;
 SET GLOBAL innodb_file_per_table = 1;
 SET GLOBAL innodb_file_format = `Barracuda`;
 USE testdb_wl6445;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 SELECT t2_i,LEFT(t2_j,20) FROM t2 ORDER BY t2_i;
 CALL proc1(@a);
 SELECT @a;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 CALL proc2(2,'test2');
 SELECT * FROM t3;

 # try to CREATE temp table 
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TEMPORARY TABLE temp_1 ( i INT ) ENGINE = Innodb;

 # Try to insert with partitioned table
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO testdb_wl6445.t4 VALUES (1),(2),(3),(4),(5),(6);
 SELECT * FROM testdb_wl6445.t4 ORDER BY val;

@@ -546,11 +546,11 @@ SET GLOBAL innodb_print_all_deadlocks = 'ON';


 USE testdb_wl6445;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (1,repeat('a',200)),(2,repeat('b',200)),(3,repeat('c',200));
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i + 1;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 DELETE FROM t1 ;


@@ -626,13 +626,13 @@ SELECT * FROM t1 WHERE MATCH (j) AGAINST ('innodb') ;
 --source include/wait_until_connected_again.inc
 USE testdb_wl6445;
 # check if root user able to modify 
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i + 20;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 DELETE FROM t1;
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TABLE t2 ( i INT ) ENGINE = Innodb;
 CREATE USER 'test5'@'localhost' IDENTIFIED BY '123';
 GRANT ALL ON testdb_wl6445.* TO 'test5'@'localhost';

--- a/mysql-test/suite/innodb/t/innodb-wl6445-2.test
+++ b/mysql-test/suite/innodb/t/innodb-wl6445-2.test
@@ -80,16 +80,16 @@ SELECT i,LEFT(j,20) FROM t1 ORDER BY i;

 USE testdb_wl6445;
 SELECT i FROM t1 ORDER BY i;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;

--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i+1;

 # Fix in next revision - known ( no data returned)
@@ -164,18 +164,18 @@ SELECT i,LEFT(j,20) FROM t2 ORDER BY i;
 USE testdb_wl6445;
 SELECT i FROM t1 ORDER BY i;
 SELECT i FROM t2 ORDER BY i;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;

--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200));
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 --ERROR ER_TABLE_EXISTS_ERROR
 CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb;
--ERROR ER_INNODB_READ_ONLY
+--ERROR ER_CANT_CREATE_TABLE
 CREATE TABLE t3 ( i int , j blob) ENGINE = Innodb;
--ERROR ER_CANT_LOCK
+--ERROR ER_OPEN_AS_READONLY
 UPDATE t1 SET i = i+1;

 # Fix in next revision - known ( no data returned)
@@ -217,7 +217,7 @@ let SEARCH_FILE= $error_log;
 #----------------------------------------------------------------------------------
 # Detailed explanations of what happens are placed nearby the checks.
 --error 1
--exec $MYSQLD_CMD --loose-console > $error_log 2>&1
+--exec $MYSQLD_CMD --loose-console --default-storage-engine=innodb > $error_log 2>&1

 # We get depending on the platform either "./ibdata1" or ".\ibdata1".
 let SEARCH_PATTERN=InnoDB: The system tablespace must be writable;

--- a/mysql-test/suite/innodb/t/innodb-wl6445.test
+++ b/mysql-test/suite/innodb/t/innodb-wl6445.test
@@ -35,35 +35,35 @@ SHOW CREATE TABLE WL6445.t1;

 SELECT COUNT(*) FROM WL6445.t1;

--error ER_CANT_LOCK
+--error ER_OPEN_AS_READONLY
 INSERT INTO WL6445.t1 VALUES(3,3);

 --ERROR ER_OPEN_AS_READONLY
 INSERT INTO WL6445.t1 SELECT * FROM WL6445.t1;

--error ER_CANT_LOCK
+--error ER_OPEN_AS_READONLY
 REPLACE INTO WL6445.t1 VALUES(1,1);

--error ER_CANT_LOCK
+--error ER_OPEN_AS_READONLY
 UPDATE WL6445.t1 SET c1 = c1 + 100;

--error ER_CANT_LOCK
+--error ER_OPEN_AS_READONLY
 DELETE FROM WL6445.t1;

 # DDL
 --error ER_DUP_FIELDNAME
 ALTER TABLE WL6445.t1 ADD COLUMN c2 INT;

--error ER_CANT_LOCK
+--error ER_OPEN_AS_READONLY
 ALTER TABLE WL6445.t1 ADD UNIQUE INDEX(c1);

--error ER_CANT_LOCK
+--error ER_OPEN_AS_READONLY
 ALTER TABLE WL6445.t1 DROP INDEX sec_idx;

 # FIXME: Should bne
 #--error ER_OPEN_AS_READONLY
 --replace_regex /wl6445/WL6445/i
--error ER_BAD_TABLE_ERROR
+--error ER_OPEN_AS_READONLY
 DROP TABLE WL6445.t1;

 --error ER_OPEN_AS_READONLY
@@ -74,7 +74,7 @@ TRUNCATE TABLE WL6445.t1;
 RENAME TABLE WL6445.t1 TO WL6444.t2;

 --replace_regex /wl6445/WL6445/i
--error ER_BAD_TABLE_ERROR
+--error ER_OPEN_AS_READONLY
 DROP DATABASE WL6445;

 SHOW CREATE TABLE WL6445.t1;