bzr push into mysql-6.0-falcon-team branch (john.embretsen:2780)

[John H. Embretsen]

 2780 John H. Embretsen	2009-09-04 [merge]
      Merge.

    modified:
      storage/falcon/DataPage.cpp
=== modified file 'mysql-test/collections/mysql-6.0-falcon-team.weekly'
--- a/mysql-test/collections/mysql-6.0-falcon-team.weekly	2009-07-30 08:00:26 +0000
+++ b/mysql-test/collections/mysql-6.0-falcon-team.weekly	2009-09-04 13:33:41 +0000
@@ -1,2 +1,2 @@
 perl mysql-test-run.pl --force --comment=other_falcon --suite=main,funcs_1,parts,rpl --do-test=.*falcon.* --experimental=collections/default.experimental
-perl mysql-test-run.pl --comment=falcon_big --suite=falcon --force --retry-failure=0 --skip-ndb --big-test --suite-timeout=1440 --testcase-timeout=300 --experimental=collections/default.experimental falcon_blob_space-big falcon_bug_22169-big falcon_bug_22207-big falcon_bug_26433-big falcon_bug_30124-big falcon_bug_34351_A-big falcon_bug_34351_C-big falcon_bug_36294-big falcon_record_cache_memory_leak-big falcon_unicode-big 
+perl mysql-test-run.pl --comment=falcon_big --suite=falcon --force --retry-failure=0 --skip-ndb --big-test --suite-timeout=1440 --testcase-timeout=300 --experimental=collections/default.experimental falcon_blob_space-big falcon_bug_22169-big falcon_bug_22207-big falcon_bug_26433-big falcon_bug_30124-big falcon_bug_34351_A-big falcon_bug_34351_C-big falcon_bug_36294-big falcon_record_cache_memory_leak-big falcon_record_cache_memory_leak2-big falcon_unicode-big 

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_22150-big.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_22150-big.test	2008-04-25 11:01:51 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22150-big.test	2009-09-04 13:33:41 +0000
@@ -54,11 +54,13 @@ DELIMITER ;//
 # ----------------------------------------------------- #
 --echo # Sent call p1() to the server but do not pull the results
 --send CALL p1()
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 
 --echo # Switch to connection conn1
 connection conn1;
 --real_sleep 1
 CALL p1();
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 
 --echo # Switch to connection default
 connection default;
@@ -67,11 +69,13 @@ connection default;
 --echo # Sent call p1() to the server but do not pull the results
 --real_sleep 1
 --send CALL p1()
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 
 --echo # Switch to connection conn1
 connection conn1;
 --real_sleep 1
 CALL p1();
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 
 --echo # Switch to connection default
 connection default;

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_22169-big.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_22169-big.test	2008-04-25 10:46:09 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22169-big.test	2009-09-04 13:33:41 +0000
@@ -41,12 +41,16 @@ INSERT INTO t1 (id, grp, id_rev) SELECT 
 INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
 INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
 INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
 INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
 INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;
 INSERT INTO t2 (id, grp, id_rev) SELECT id, grp, id_rev FROM t1;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 DROP TABLE t2;
 --enable_query_log
 

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_22207-big.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_22207-big.test	2008-09-09 08:30:18 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22207-big.test	2009-09-04 13:33:41 +0000
@@ -65,6 +65,7 @@ while ($i) 
     --enable_query_log
     SELECT c1 from t1;
     dec $i;
+    --system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 }
 
 # ----------------------------------------------------- #

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_36294-big.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_36294-big.test	2009-03-19 18:16:50 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_36294-big.test	2009-09-04 13:33:41 +0000
@@ -40,16 +40,27 @@ INSERT INTO ftest(col1) SELECT col1 FROM
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+--system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
 INSERT INTO ftest(col1) SELECT col1 FROM ftest;
 --enable_warnings
 --enable_abort_on_error

=== modified file 'mysql-test/suite/falcon/t/falcon_record_cache_memory_leak-big.test'
--- a/mysql-test/suite/falcon/t/falcon_record_cache_memory_leak-big.test	2008-04-25 10:46:09 +0000
+++ b/mysql-test/suite/falcon/t/falcon_record_cache_memory_leak-big.test	2009-09-04 13:33:41 +0000
@@ -37,6 +37,12 @@ while ($i)
     UPDATE t1 SET c1 = upper(c1);
 
     dec $i;
+    
+    if(`SELECT IF($i MOD 100000 = 0, 1, 0)`)
+    {
+        --system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
+    }
+
 }
 --enable_query_log
 

=== modified file 'mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2-big.test'
--- a/mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2-big.test	2008-04-25 10:46:09 +0000
+++ b/mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2-big.test	2009-09-04 13:33:41 +0000
@@ -42,6 +42,13 @@ while ($i) 
     COMMIT;
 
     dec $i;
+
+    
+    if(`SELECT IF($i MOD 100000 = 0, 1, 0)`)
+    {
+        --system echo '== Forced output from test to avoid timeout in Pushbuild 2 =='
+    }
+
 }
 --enable_query_log
 


Attachment: [text/bzr-bundle] bzr/[e-mail]