bzr commit into mysql-5.1-telco-7.0 branch (jonas:4377)

[Jonas Oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:ole.john.aske@stripped

 4377 Jonas Oreland	2011-05-13
      ndb - add "manual" timeout on 600s to ndb_alter_table_online2 in order to try to track down spurious 900s timeout reported by mtr

    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_online2.result
      mysql-test/suite/ndb/t/ndb_alter_table_online2.test
=== modified file 'mysql-test/suite/ndb/r/ndb_alter_table_online2.result'
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online2.result	2009-10-09 15:48:57 +0000
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online2.result	2011-05-13 11:42:59 +0000
@@ -75,6 +75,9 @@ name
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 update t1 set c= 0;
+select * from t1;
+pk	a	b	c
[phone]
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~ Alter table t1 and try to add partitions

=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online2.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online2.test	2009-10-09 15:48:57 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online2.test	2011-05-13 11:42:59 +0000
@@ -52,7 +52,7 @@ set @t1_id = (select id from ndb_show_ta
 --echo
 
 let $end_mysqlslap= 5000;
---exec $MYSQL_SLAP --silent --query="update test.t1 set a=a+1 where pk=1" -i $end_mysqlslap >> $NDB_TOOLS_OUTPUT &
+--exec $MYSQL_SLAP --query="update test.t1 set a=a+1 where pk=1" -i $end_mysqlslap >> $NDB_TOOLS_OUTPUT &
 
 # wait for 100 updates
 --disable_result_log
@@ -93,7 +93,7 @@ select name from ndb_show_tables_results
 --echo
 
 update t1 set b= 0;
---exec $MYSQL_SLAP --silent --query="update test.t1 set b=b+1 where pk=1" -i $end_mysqlslap >> $NDB_TOOLS_OUTPUT &
+--exec $MYSQL_SLAP --query="update test.t1 set b=b+1 where pk=1" -i $end_mysqlslap >> $NDB_TOOLS_OUTPUT &
 
 # wait for 100 updates
 --disable_result_log
@@ -134,22 +134,32 @@ select name from ndb_show_tables_results
 --echo
 
 update t1 set c= 0;
---exec $MYSQL_SLAP --silent --query="update test.t1 set c=c+1 where pk=1" -i $end_mysqlslap >> $NDB_TOOLS_OUTPUT &
+--exec $MYSQL_SLAP --query="update test.t1 set c=c+1 where pk=1" -i $end_mysqlslap >> $NDB_TOOLS_OUTPUT &
 
 # wait for mysqlslap to end
 --disable_result_log
 --disable_query_log
 --eval select @end:=$end_mysqlslap
 let $val= 1;
+# 10 minutes = 600s sleep 0.1 => 6000
+let $maxwait = 6000;
 while ($val)
 {
   --sleep 0.1
   select @val1:=a,@val2:=b,@val3:=c from t1 where pk=1;
   let $val= `select @end > @val1 || @end > @val2 || @end > @val3`;
+  dec $maxwait;
+
+  if (!$maxwait)
+  {
+    let $val = 0;
+  }
 }
 --enable_result_log
 --enable_query_log
 
+select * from t1;
+
 --echo
 --echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 --echo ~ Alter table t1 and try to add partitions


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