MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Martin Skold Date:October 15 2009 8:36pm
Subject:bzr push into mysql-5.1-telco-6.3 branch (Martin.Skold:3108 to 3109)
View as plain text  
 3109 Martin Skold	2009-10-15 [merge]
      Merge
      modified:
        mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result

 3108 Martin Skold	2009-10-15 [merge]
      Merge
      modified:
        storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
        storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
        storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp

=== modified file 'mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result'
--- a/mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result	2009-05-08 14:43:21 +0000
+++ b/mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result	2009-10-15 15:45:56 +0000
@@ -337,7 +337,7 @@ t1	CREATE TABLE `t1` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) /*!50100 TABLESPACE table_space1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE table_space1 STORAGE DISK */ ENGINE=ndbcluster AUTO_INCREMENT=251 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c3)
 PARTITIONS 4 */
 SHOW CREATE TABLE test.t2;
@@ -348,7 +348,7 @@ t2	CREATE TABLE `t2` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster AUTO_INCREMENT=251 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY KEY (c3)
 (PARTITION p0 ENGINE = ndbcluster,
  PARTITION p1 ENGINE = ndbcluster) */
@@ -360,7 +360,7 @@ t3	CREATE TABLE `t3` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster AUTO_INCREMENT=251 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (c3)
 (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster,
  PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster,
@@ -373,7 +373,7 @@ t4	CREATE TABLE `t4` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster AUTO_INCREMENT=251 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (c3)
 PARTITIONS 2 */
 SHOW CREATE TABLE test.t5;
@@ -384,7 +384,7 @@ t5	CREATE TABLE `t5` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster AUTO_INCREMENT=251 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY KEY (pk1)
 (PARTITION p0 ENGINE = ndbcluster,
  PARTITION p1 ENGINE = ndbcluster) */
@@ -396,7 +396,7 @@ t6	CREATE TABLE `t6` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster AUTO_INCREMENT=251 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY RANGE (pk1)
 (PARTITION x1 VALUES LESS THAN (333) ENGINE = ndbcluster,
  PARTITION x2 VALUES LESS THAN (720) ENGINE = ndbcluster) */

Thread
bzr push into mysql-5.1-telco-6.3 branch (Martin.Skold:3108 to 3109) Martin Skold15 Oct