MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Patrick Crews Date:March 18 2009 2:32am
Subject:bzr commit into mysql-5.1-bugteam branch (patrick.crews:2842) Bug#43716
View as plain text  
#At file:///Users/pcrews/usr/local/bin/data1/work/mysqlbinlog_row_big/mysql-5.1-bugteam/ based on revid:patrick.crews@stripped

 2842 Patrick Crews	2009-03-17
      Bug#43716: Test mysqlbinlog_row_big is failing, needs to be updated.
      
      Altered .test file to re-enable certain disabled portions of the test.
      Added a master.opt file to set max_allowed_packet
      Re-recorded .result file to accommodate new changes to the test.

    added:
      mysql-test/t/mysqlbinlog_row_big-master.opt
    modified:
      mysql-test/r/mysqlbinlog_row_big.result
      mysql-test/t/mysqlbinlog_row_big.test
=== modified file 'mysql-test/r/mysqlbinlog_row_big.result'
--- a/mysql-test/r/mysqlbinlog_row_big.result	2008-12-13 19:42:12 +0000
+++ b/mysql-test/r/mysqlbinlog_row_big.result	2009-03-18 02:32:23 +0000
@@ -7,10 +7,6 @@ DROP TABLE IF EXISTS t1;
 #
 SET timestamp=1000000000;
 #
-# We need big packets.
-#
-SET @@global.max_allowed_packet= 1024*1024*1024;
-#
 # Delete all existing binary logs.
 #
 RESET MASTER;
@@ -26,33 +22,49 @@ c1 LONGTEXT
 #
 # Insert a big row.
 #
+256MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 16777216));
+affected rows: 1
+32MB
 INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 2097152));
 affected rows: 1
+4MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 262144));
+affected rows: 1
+512KB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 32768));
+affected rows: 1
 #
 # Show what we have in the table.
 # Do not display the column value itself, just its length.
 #
 SELECT LENGTH(c1) FROM t1;
+LENGTH(c1)	268435456
 LENGTH(c1)	33554432
-affected rows: 1
+LENGTH(c1)	4194304
+LENGTH(c1)	524288
+affected rows: 4
 #
 # Grow the row by updating.
 #
 UPDATE t1 SET c1 = CONCAT(c1, c1);
-affected rows: 1
-info: Rows matched: 1  Changed: 1  Warnings: 0
+affected rows: 4
+info: Rows matched: 4  Changed: 4  Warnings: 0
 #
 # Show what we have in the table.
 # Do not display the column value itself, just its length.
 #
 SELECT LENGTH(c1) FROM t1;
+LENGTH(c1)	536870912
 LENGTH(c1)	67108864
-affected rows: 1
+LENGTH(c1)	8388608
+LENGTH(c1)	1048576
+affected rows: 4
 #
 # Delete the row.
 #
 DELETE FROM t1 WHERE c1 >= 'ManyMegaByteBlck';
-affected rows: 1
+affected rows: 4
 #
 # Hide how much rows are affected by each statement.
 #

=== added file 'mysql-test/t/mysqlbinlog_row_big-master.opt'
--- a/mysql-test/t/mysqlbinlog_row_big-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/mysqlbinlog_row_big-master.opt	2009-03-18 02:32:23 +0000
@@ -0,0 +1 @@
+--max_allowed_packet=1G

=== modified file 'mysql-test/t/mysqlbinlog_row_big.test'
--- a/mysql-test/t/mysqlbinlog_row_big.test	2008-12-13 19:42:12 +0000
+++ b/mysql-test/t/mysqlbinlog_row_big.test	2009-03-18 02:32:23 +0000
@@ -1,7 +1,7 @@
 # mysqlbinlog_big.test
 #
 # Show that mysqlbinlog can handle big rows.
-#
+# max_allowed_packet is now set via a master.opt file due to changes in 5.1.31
 
 #
 # The *huge* output of mysqlbinlog will be redirected to
@@ -36,11 +36,6 @@ DROP TABLE IF EXISTS t1;
 SET timestamp=1000000000;
 
 --echo #
---echo # We need big packets.
---echo #
-SET @@global.max_allowed_packet= 1024*1024*1024;
-
---echo #
 --echo # Delete all existing binary logs.
 --echo #
 RESET MASTER;
@@ -61,17 +56,17 @@ eval CREATE TABLE t1 (
 --echo # Insert a big row.
 --echo #
 #
-# 256MB
-#INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 16777216));
+--echo 256MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 16777216));
 #
-# 32MB
+--echo 32MB
 INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 2097152));
 #
-# 4MB
-#INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 262144));
+--echo 4MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 262144));
 #
-# 512KB
-#INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 32768));
+--echo 512KB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 32768));
 
 --echo #
 --echo # Show what we have in the table.
@@ -113,7 +108,7 @@ FLUSH LOGS;
 --echo #       at the bottom of the test script.
 --echo #
 let $MYSQLD_DATADIR= `select @@datadir`;
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/
 --exec $MYSQL_BINLOG -v -v $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output
 


Attachment: [text/bzr-bundle] bzr/patrick.crews@sun.com-20090318023223-n3rw43ezlc0vo0o0.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (patrick.crews:2842) Bug#43716Patrick Crews18 Mar