bzr push into mysql-trunk branch (vinay.fisrekar:4290 to 4291)

[Vinay Fisrekar]

 4291 Vinay Fisrekar	2012-09-07
      Adding small check in test with DCL when both "--innodb-read-only" and "--read-only" are passed

    modified:
      mysql-test/suite/innodb/r/innodb-wl6445-1.result
      mysql-test/suite/innodb/t/innodb-wl6445-1.test
 4290 Sunny Bains	2012-09-07
      WL#6445 - Prevent scan of log records in read-only mode once we determined
      that the database wasn't shutdown cleanly.

    modified:
      storage/innobase/log/log0recv.cc
=== modified file 'mysql-test/suite/innodb/r/innodb-wl6445-1.result'
--- a/mysql-test/suite/innodb/r/innodb-wl6445-1.result	2012-09-06 15:52:33 +0000
+++ b/mysql-test/suite/innodb/r/innodb-wl6445-1.result	2012-09-07 09:19:14 +0000
@@ -1275,6 +1275,10 @@ UPDATE t1 SET i = i + 20;
 ERROR HY000: Table 't1' is read only
 DELETE FROM t1;
 ERROR HY000: Table 't1' is read only
+CREATE TABLE t2 ( i INT ) ENGINE = Innodb;
+ERROR HY000: Table 't2' is read only
+CREATE USER 'test5'@'localhost' IDENTIFIED BY '123';
+GRANT ALL ON testdb_wl6445.* TO 'test5'@'localhost';
 USE testdb_wl6445;
 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;
@@ -1304,7 +1308,11 @@ DELETE FROM t1;
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 i	LEFT(j,20)
 CREATE TABLE t2 ( i INT ) ENGINE = Innodb;
+CREATE USER 'test5_2'@'localhost' IDENTIFIED BY '123';
+GRANT ALL ON testdb_wl6445.* TO 'test5_2'@'localhost';
 USE testdb_wl6445;
+DROP USER 'test5_2'@'localhost';
+DROP USER 'test5'@'localhost';
 DROP DATABASE testdb_wl6445;
 case # 6
 DROP DATABASE IF EXISTS testdb_wl6445;

=== modified file 'mysql-test/suite/innodb/t/innodb-wl6445-1.test'
--- a/mysql-test/suite/innodb/t/innodb-wl6445-1.test	2012-09-06 15:52:33 +0000
+++ b/mysql-test/suite/innodb/t/innodb-wl6445-1.test	2012-09-07 09:19:14 +0000
@@ -634,8 +634,10 @@ INSERT INTO t1 VALUES (11,repeat('a',200
 UPDATE t1 SET i = i + 20;
 --ERROR ER_OPEN_AS_READONLY
 DELETE FROM t1;
-
-
+--ERROR ER_OPEN_AS_READONLY
+CREATE TABLE t2 ( i INT ) ENGINE = Innodb;
+CREATE USER 'test5'@'localhost' IDENTIFIED BY '123';
+GRANT ALL ON testdb_wl6445.* TO 'test5'@'localhost';
 
 
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -655,6 +657,8 @@ SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 DELETE FROM t1;
 SELECT i,LEFT(j,20) FROM t1 ORDER BY i;
 CREATE TABLE t2 ( i INT ) ENGINE = Innodb;
+CREATE USER 'test5_2'@'localhost' IDENTIFIED BY '123';
+GRANT ALL ON testdb_wl6445.* TO 'test5_2'@'localhost';
 
 
 #------------------------------------------------------------------------------
@@ -672,6 +676,8 @@ CREATE TABLE t2 ( i INT ) ENGINE = Innod
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 USE testdb_wl6445;
+DROP USER 'test5_2'@'localhost';
+DROP USER 'test5'@'localhost';
 DROP DATABASE testdb_wl6445;
 
 

No bundle (reason: useless for push emails).