From: Annamalai Gurusami
Date: September 3 2012 10:27am
Subject: bzr push into mysql-5.6 branch (annamalai.gurusami:4222 to 4223)
List-Archive: http://lists.mysql.com/commits/144679
Message-Id: <201209031027.q83AR9An021504@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4223 Annamalai Gurusami	2012-09-03
      This test case also must mask the maximum row size because
      of the dependency with the page size.  

    modified:
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/t/innodb_4k.test
 4222 Annamalai Gurusami	2012-09-03
      For this test case also, the maximum row size is masked because
      it depends on the page size. 

    modified:
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/t/innodb_8k.test
=== modified file 'mysql-test/suite/innodb/r/innodb_4k.result'
--- a/mysql-test/suite/innodb/r/innodb_4k.result	revid:annamalai.gurusami@stripped
+++ b/mysql-test/suite/innodb/r/innodb_4k.result	revid:annamalai.gurusami@stripped
@@ -61,7 +61,7 @@ CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(128)
 ) ROW_FORMAT=redundant;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1979. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(155)
@@ -71,7 +71,7 @@ CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(156)
 ) ROW_FORMAT=compact;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(76)
@@ -81,7 +81,7 @@ CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(79)
 ) ROW_FORMAT=compressed;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(155)
@@ -91,7 +91,7 @@ CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(156)
 ) ROW_FORMAT=dynamic;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
 CREATE TABLE t1 (a varchar(64) character set utf8,
 b varchar(64) character set utf8,
 c varchar(64) character set utf8,
@@ -394,7 +394,7 @@ CREATE TABLE t1(
 c text NOT NULL, d text NOT NULL,
 PRIMARY KEY (c(767)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
 CREATE TABLE t1(
 c text NOT NULL, d text NOT NULL,
 PRIMARY KEY (c(767)))
@@ -407,7 +407,7 @@ ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_
 drop table t1;
 CREATE TABLE t1(c text, PRIMARY KEY (c(440)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
 CREATE TABLE t1(c text, PRIMARY KEY (c(438)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));

=== modified file 'mysql-test/suite/innodb/t/innodb_4k.test'
--- a/mysql-test/suite/innodb/t/innodb_4k.test	revid:annamalai.gurusami@stripped
+++ b/mysql-test/suite/innodb/t/innodb_4k.test	revid:annamalai.gurusami@stripped
@@ -74,6 +74,7 @@ c01 char(200), c02 char(200), c03 char(2
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(127)
 ) ROW_FORMAT=redundant;
 DROP TABLE t1;
+--replace_regex /> [0-9]*/> max_row_size/
 --error ER_TOO_BIG_ROWSIZE
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
@@ -86,6 +87,7 @@ c01 char(200), c02 char(200), c03 char(2
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(155)
 ) ROW_FORMAT=compact;
 DROP TABLE t1;
+--replace_regex /> [0-9]*/> max_row_size/
 --error ER_TOO_BIG_ROWSIZE
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
@@ -99,6 +101,7 @@ c01 char(200), c02 char(200), c03 char(2
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(76)
 ) ROW_FORMAT=compressed;
 DROP TABLE t1;
+--replace_regex /> [0-9]*/> max_row_size/
 --error ER_TOO_BIG_ROWSIZE
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
@@ -111,6 +114,7 @@ c01 char(200), c02 char(200), c03 char(2
 c06 char(200), c07 char(200), c08 char(200), c09 char(200), c10 char(155)
 ) ROW_FORMAT=dynamic;
 DROP TABLE t1;
+--replace_regex /> [0-9]*/> max_row_size/
 --error ER_TOO_BIG_ROWSIZE
 CREATE TABLE t1 (
 c01 char(200), c02 char(200), c03 char(200), c04 char(200), c05 char(200),
@@ -301,6 +305,7 @@ UPDATE t1 SET d=@e;
 # The function dict_index_too_big_for_undo() prevents us from adding
 # one more index.  But it is too late.  The record is already too big.
 # See bug#12953735
+--replace_regex /> [0-9]*/> max_row_size/
 -- error ER_TOO_BIG_ROWSIZE
 CREATE INDEX t1e ON t1 (e(767));
 
@@ -410,6 +415,7 @@ DROP TABLE t1;
 # The following should fail in non-strict mode too.
 # (The fix of Bug #50945 only affects REDUNDANT and COMPACT tables.)
 SET SESSION innodb_strict_mode = off;
+--replace_regex /> [0-9]*/> max_row_size/
 --error ER_TOO_BIG_ROWSIZE
 CREATE TABLE t1(
 	c text NOT NULL, d text NOT NULL,
@@ -425,6 +431,7 @@ CREATE TABLE t1(
 	PRIMARY KEY (c(767)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4 CHARSET=ASCII;
 drop table t1;
+--replace_regex /> [0-9]*/> max_row_size/
 --error ER_TOO_BIG_ROWSIZE
 CREATE TABLE t1(c text, PRIMARY KEY (c(440)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;

No bundle (reason: useless for push emails).