List:Commits« Previous MessageNext Message »
From:kevin.lewis Date:March 9 2011 5:19pm
Subject:bzr push into mysql-trunk-innodb branch (kevin.lewis:3532 to 3533)
View as plain text  
 3533 kevin.lewis@stripped	2011-03-09 [merge]
      Merge from mysql-5.5-innodb

    modified:
      mysql-test/suite/innodb/r/innodb_bug60196.result
      mysql-test/suite/innodb/t/innodb_bug60196.test
 3532 Vasil Dimov	2011-03-09
      Implement WL#5739 Increase the max size of redo log files
      
      * Remove constraints that assert the log file size should be less than 4GB
      * Checkpoint offset field was stored in 4 bytes on disk, store the lower 32
        bits as before and the high 32 bits in a new 4 byte field
      * Introduce a new type lsn_t and do _all_ LSN storage and arithmetic with it
      * Introduce LSN_MAX and LSN_PF (printf format specifier)
      * Change all LSN related variables from ib_uint64_t or ulint to lsn_t
      
      Also fixes Bug#58779 Increase the max size of redo log files
      
      Reviewed by:	Inaam (rb://599)

    modified:
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0flu.ic
      storage/innobase/include/fil0fil.h
      storage/innobase/include/log0log.h
      storage/innobase/include/log0log.ic
      storage/innobase/include/log0recv.h
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/srv0start.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/univ.i
      storage/innobase/log/log0log.c
      storage/innobase/log/log0recv.c
      storage/innobase/row/row0mysql.c
      storage/innobase/srv/srv0mon.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/trx/trx0sys.c
      storage/innobase/trx/trx0trx.c
=== modified file 'mysql-test/suite/innodb/r/innodb_bug60196.result'
--- a/mysql-test/suite/innodb/r/innodb_bug60196.result	revid:vasil.dimov@stripped
+++ b/mysql-test/suite/innodb/r/innodb_bug60196.result	revid:kevin.lewis@stripped
@@ -1,9 +1,6 @@
-DROP TABLE IF EXISTS Bug_60196_FK1 ;
-DROP TABLE IF EXISTS Bug_60196_FK2 ;
-DROP TABLE IF EXISTS Bug_60196 ;
-CREATE TABLE `Bug_60196_FK1` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
-CREATE TABLE `Bug_60196_FK2` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
-CREATE TABLE `Bug_60196` (
+CREATE TABLE Bug_60196_FK1 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE Bug_60196_FK2 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE Bug_60196 (
 FK1_Key INT NOT NULL,
 FK2_Key INT NOT NULL,
 PRIMARY KEY (FK2_Key, FK1_Key),
@@ -46,7 +43,7 @@ FK1_Key	FK2_Key
 1	1
 1	2
 1	3
-# Stop master server
+# Stop server
 # Restart server.
 #
 # Try to insert more to the example table with foreign keys.

=== modified file 'mysql-test/suite/innodb/t/innodb_bug60196.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60196.test	revid:vasil.dimov@stripped
+++ b/mysql-test/suite/innodb/t/innodb_bug60196.test	revid:kevin.lewis@stripped
@@ -1,26 +1,20 @@
 # Bug#60196 - Setting lowercase_table_names to 2 on Windows causing
 # Foreign Key problems after an engine is restarted.
 
-# This test case needs InnoDB.
---source include/have_innodb.inc
+# This test case needs InnoDB, a lowercase file system,
+# lower-case-table-names=2, and cannot use the embedded server
+# because it restarts the server.
+--source include/not_embedded.inc
 --source include/have_lowercase2.inc
 --source include/have_case_insensitive_file_system.inc
-
-#
-# Precautionary clean up.
-#
---disable_warnings
-DROP TABLE IF EXISTS Bug_60196_FK1 ;
-DROP TABLE IF EXISTS Bug_60196_FK2 ;
-DROP TABLE IF EXISTS Bug_60196 ;
---enable_warnings
+--source include/have_innodb.inc
 
 #
 # Create test data.
 #
-CREATE TABLE `Bug_60196_FK1` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
-CREATE TABLE `Bug_60196_FK2` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
-CREATE TABLE `Bug_60196` (
+CREATE TABLE Bug_60196_FK1 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE Bug_60196_FK2 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE Bug_60196 (
   FK1_Key INT NOT NULL,
   FK2_Key INT NOT NULL,
   PRIMARY KEY (FK2_Key, FK1_Key),
@@ -49,7 +43,7 @@ SELECT * FROM bug_60196_FK1;
 SELECT * FROM bug_60196_FK2;
 SELECT * FROM bug_60196;
 
---echo # Stop master server
+--echo # Stop server
 
 # Write file to make mysql-test-run.pl wait for the server to stop
 -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-innodb branch (kevin.lewis:3532 to 3533) kevin.lewis9 Mar