bzr push into mysql-6.0-falcon-team branch (hky:2908 to 2909)

[Hakan Kuecuekyilmaz]

 2909 Hakan Kuecuekyilmaz	2008-11-12
      Enabled falcon_bug_28095.test again
      to see whether restart works with
      Valgrind.
modified:
  mysql-test/include/restart_mysqld.inc
  mysql-test/include/wait_until_connected_again.inc
  mysql-test/suite/falcon/t/falcon_bug_28095.test

 2908 Christopher Powers	2008-11-11
      Bug#38569, "Falcon assertion in SRLUpdateIndex::thaw : type == srlUpdateIndex"
      
      The fix for Bug#39696, "Assertion in Table.cpp (dup->state == recDeleted)"
      exposed another problem with chill/thaw for deferred indexes.
      
      Changed SRLUpdateIndex::append() to advance past srlVersion records written
      at the top of each block within a window.
      
      Also removed a gap in mutex protection in the loop that reconstructs the
      DeferredIndex from multiple serial log records.
modified:
  storage/falcon/SRLUpdateIndex.cpp
  storage/falcon/SerialLogControl.cpp
  storage/falcon/SerialLogRecord.cpp
  storage/falcon/SerialLogRecord.h

=== modified file 'mysql-test/include/restart_mysqld.inc'
--- a/mysql-test/include/restart_mysqld.inc	2008-11-03 17:51:36 +0000
+++ b/mysql-test/include/restart_mysqld.inc	2008-11-12 20:01:57 +0000
@@ -1,4 +1,4 @@
-
+#
 # Write file to make mysql-test-run.pl expect the "crash", but don't start
 # it until it's told to
 --write_file $MYSQLTEST_VARDIR/tmp/master0.expect
@@ -6,8 +6,8 @@ wait
 EOF
 
 # Send shutdown to the connected server and give
-# it 10 seconds to die before zapping it
-shutdown_server 10;
+# it 30 seconds to die before zapping it.
+shutdown_server 30;
 
 # Check server is gone
 --source include/wait_until_disconnected.inc
@@ -25,4 +25,3 @@ EOF
 
 # Turn off reconnect again
 --disable_reconnect
-

=== modified file 'mysql-test/include/wait_until_connected_again.inc'
--- a/mysql-test/include/wait_until_connected_again.inc	2008-11-03 17:51:36 +0000
+++ b/mysql-test/include/wait_until_connected_again.inc	2008-11-12 20:01:57 +0000
@@ -4,7 +4,7 @@
 # You should have done --enable_reconnect first
 --disable_result_log
 --disable_query_log
-let $counter= 300;
+let $counter= 600;
 let $mysql_errno= 9999;
 while ($mysql_errno)
 {
@@ -19,7 +19,7 @@ while ($mysql_errno)
   {
     --die Server failed to restart
   }
-  --sleep 0.1
+  --real_sleep 0.1
 }
 --enable_query_log
 --enable_result_log

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_28095.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-11 12:47:29 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-12 20:01:57 +0000
@@ -14,7 +14,7 @@
 # disabled in valgrind runs.
 # Re-enable when "soft" server restart works with Valgrind.
 ####
---source include/not_valgrind.inc
+#--source include/not_valgrind.inc
 
 --echo *** Bug #28095: First phase ***