bzr push into mysql-trunk-wl5534-stage branch (marko.makela:3820 to 3822)

[marko.makela]

 3822 Marko Mäkelä	2012-02-02
      Speed up innodb-index-online.test in Valgrind by reducing memory usage.

    modified:
      mysql-test/suite/innodb/r/innodb-index-online.result
      mysql-test/suite/innodb/t/innodb-index-online-master.opt
      mysql-test/suite/innodb/t/innodb-index-online.test
 3821 Marko Mäkelä	2012-02-02
      Increase --debug-sync-timeout if --valgrind.

    modified:
      mysql-test/mysql-test-run.pl
 3820 Marko MäkelINDEX CREATION FOR ZERO-LENGTH RECORD
      
      Relax debug assertions, to allow a zero-length index record to be created.

    modified:
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	revid:marko.makela@stripped25830-51nfe22mai8gnzq8
+++ b/mysql-test/mysql-test-run.pl	revid:marko.makela@strippednqbn5
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1691,7 +1691,7 @@ sub command_line_setup {
     $opt_testcase_timeout*= 10;
     $opt_suite_timeout*= 6;
     $opt_start_timeout*= 10;
-
+    $opt_debug_sync_timeout*= 10;
   }
   elsif ( $opt_valgrind_mysqld )
   {

=== modified file 'mysql-test/suite/innodb/r/innodb-index-online.result'
--- a/mysql-test/suite/innodb/r/innodb-index-online.result	revid:[e-mail]-20120202125830-51nfe22mai8gnzq8
+++ b/mysql-test/suite/innodb/r/innodb-index-online.result	revid:marko.makela@stripped
@@ -1,3 +1,4 @@
+call mtr.add_suppression("InnoDB: Warning: Small buffer pool size");
 call mtr.add_suppression("Cannot find index .*c2 in InnoDB index translation table");
 call mtr.add_suppression("Find index .*c2 in InnoDB index list but not its MySQL index number");
 CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, c3 INT) ENGINE=InnoDB;

=== modified file 'mysql-test/suite/innodb/t/innodb-index-online-master.opt'
--- a/mysql-test/suite/innodb/t/innodb-index-online-master.opt	revid:marko.makela@stripped0-51nfe22mai8gnzq8
+++ b/mysql-test/suite/innodb/t/innodb-index-online-master.opt	revid:marko.makela@stripped120202144822-ciz1ivxrd2jnqbn5
@@ -1 +1 @@
---innodb-sort-buffer-size=64k --innodb-online-alter-log-max-size=64k
+--innodb-sort-buffer-size=64k --innodb-online-alter-log-max-size=64k --innodb-buffer-pool-size=5M --innodb-log-buffer-size=256k

=== modified file 'mysql-test/suite/innodb/t/innodb-index-online.test'
--- a/mysql-test/suite/innodb/t/innodb-index-online.test	revid:marko.makela@stripped-20120202125830-51nfe22mai8gnzq8
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test	revid:[e-mail]-20120202144822-ciz1ivxrd2jnqbn5
@@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 --source include/have_debug_sync.inc
 
+call mtr.add_suppression("InnoDB: Warning: Small buffer pool size");
 # These will be triggered by INSERT INTO t1 VALUES(6,3,1);
 call mtr.add_suppression("Cannot find index .*c2 in InnoDB index translation table");
 call mtr.add_suppression("Find index .*c2 in InnoDB index list but not its MySQL index number");

No bundle (reason: useless for push emails).