bzr push into mysql-6.0-falcon-team branch (john.embretsen:2906 to 2907) Bug#39696, Bug#40636

[John H. Embretsen]

 2907 John H. Embretsen	2008-11-11
      Disable falcon_bug_28095 in valgrind runs, as 'soft' server restart feature of mysql-test does not seem to work in such an environment. See Bug#40636 - falcon_bug_28095 test fails with 'Server failed to restart' in valgrind runs.
modified:
  mysql-test/suite/falcon/t/falcon_bug_28095.test

 2906 Christopher Powers	2008-11-08
      Bug#39696, "Assertion in Table.cpp (dup->state == recDeleted) fails during falcon_chill_thaw"
      
      The record chill operation sometimes generates SRLUpdateRecord entries in the serial
      log that have zero data length. This causes a corruption of the serial log.
      
      The total data length of the chilled records is known only after all of the records have
      been processed in SRLUpdateRecords::append(). If none of the record versions within
      a given savepoint are eligible to be chilled, the total data length of the serial log
      record will be zero.
      
      Even when there are zero bytes of data to commit to disk, SRLUpdateRecords::append() issues
      a serial log flush and forces the creation of a new serial log window. This creates a one-byte
      offset error in the serial log that ultimately results in a fatal assertion during gopher
      thread processing.
      
      To prevent this error, SRLUpdateRecords::append() now only flushes serial log records with a
      non-zero data length.
modified:
  storage/falcon/SRLUpdateRecords.cpp

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_28095.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-04 16:50:26 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-11 12:47:29 +0000
@@ -7,6 +7,15 @@
 #    server restart with --shutdown_server. We do the
 #    restart with the help of include/restart_mysqld.inc.
 #
+
+####
+# Temp: Due to Bug#40636 (falcon_bug_28095 test fails with 
+# "Server failed to restart" in valgrind runs) this test is 
+# disabled in valgrind runs.
+# Re-enable when "soft" server restart works with Valgrind.
+####
+--source include/not_valgrind.inc
+
 --echo *** Bug #28095: First phase ***
 
 # ----------------------------------------------------- #