bk commit into 6.0 tree (cbell:1.2749) BUG#32954

[cbell]

Below is the list of changes that have just been committed into a local
6.0 repository of cbell. When cbell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-13 11:30:32-05:00, cbell@mysql_cab_desk. +2 -0
  BUG#32954 : Online Backup: MyISAM default driver misses rows in release build 
  
  Problem cannot be reproduced on development machine. Restored
  backup test to use MyISAM and will test in PB.

  mysql-test/r/backup.result@stripped, 2007-12-13 11:30:21-05:00, cbell@mysql_cab_desk. +4 -4
    BUG#32954 : Online Backup: MyISAM default driver misses rows in release build 
    
    New result file.

  mysql-test/t/backup.test@stripped, 2007-12-13 11:30:22-05:00, cbell@mysql_cab_desk. +4 -4
    BUG#32954 : Online Backup: MyISAM default driver misses rows in release build 
    
    Problem cannot be reproduced on development machine. Restored
    backup test to use MyISAM and will test in PB.

diff -Nrup a/mysql-test/r/backup.result b/mysql-test/r/backup.result
--- a/mysql-test/r/backup.result	2007-12-13 09:11:55 -05:00
+++ b/mysql-test/r/backup.result	2007-12-13 11:30:21 -05:00
@@ -8,7 +8,7 @@ USE db1;
 CREATE TABLE `building` (
 `dir_code` char(4),
 `building` char(6)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+) ENGINE=MYISAM DEFAULT CHARSET=latin1;
 LOCK TABLES `building` WRITE;
 INSERT INTO `building` VALUES ('N41','1300'),('N01','1453'),('M00','1000'),('N41','1301'),('N41','1305');
 UNLOCK TABLES;
@@ -16,7 +16,7 @@ CREATE TABLE `directorate` (
 `dir_code` char(4),
 `dir_name` char(30),
 `dir_head_id` char(9)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+) ENGINE=MYISAM DEFAULT CHARSET=latin1;
 LOCK TABLES `directorate` WRITE;
 INSERT INTO `directorate` VALUES ('N41','Development','333445555'),('N01','Human Resources','123654321'),('M00','Management','333444444');
 UNLOCK TABLES;
@@ -29,7 +29,7 @@ CREATE TABLE `staff` (
 `sex` char(1),
 `salary` int(11),
 `mgr_id` char(9)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+) ENGINE=MYISAM DEFAULT CHARSET=latin1;
 LOCK TABLES `staff` WRITE;
 INSERT INTO `staff` VALUES ('333445555','John','Q','Smith','M',30000,'333444444'),('123763153','William','E','Walters','M',25000,'123654321'),('333444444','Alicia','F','St.Cruz','F',25000,NULL),('921312388','Goy','X','Hong','F',40000,'123654321'),('800122337','Rajesh','G','Kardakarna','M',38000,'333445555'),('820123637','Monty','C','Smythe','M',38000,'333445555'),('830132335','Richard','E','Jones','M',38000,'333445555'),('333445665','Edward','E','Engles','M',25000,'333445555'),('123654321','Beware','D','Borg','F',55000,'333444444'),('123456789','Wilma','N','Maxima','F',43000,'333445555');
 UNLOCK TABLES;
@@ -125,7 +125,7 @@ CREATE TABLE bup_default.wide (
 PRIMARY KEY (`a`)
 ) ENGINE=INNODB DEFAULT CHARSET=latin1;
 CREATE TABLE bup_default.t1 (a int) engine=innodb;
-CREATE TABLE bup_default.t2 (a int) engine=MEMORY;
+CREATE TABLE bup_default.t2 (a int) engine=MYISAM;
 CREATE TABLE bup_default.t1_blob (a int, b text) engine=innodb;
 INSERT INTO bup_default.wide VALUES (
 NULL,
diff -Nrup a/mysql-test/t/backup.test b/mysql-test/t/backup.test
--- a/mysql-test/t/backup.test	2007-12-13 09:11:55 -05:00
+++ b/mysql-test/t/backup.test	2007-12-13 11:30:22 -05:00
@@ -20,7 +20,7 @@ USE db1;
 CREATE TABLE `building` (
   `dir_code` char(4),
   `building` char(6)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+) ENGINE=MYISAM DEFAULT CHARSET=latin1;
 
 #
 # Dumping data for table `building`
@@ -39,7 +39,7 @@ CREATE TABLE `directorate` (
   `dir_code` char(4),
   `dir_name` char(30),
   `dir_head_id` char(9)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+) ENGINE=MYISAM DEFAULT CHARSET=latin1;
 
 #
 # Dumping data for table `directorate`
@@ -63,7 +63,7 @@ CREATE TABLE `staff` (
   `sex` char(1),
   `salary` int(11),
   `mgr_id` char(9)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+) ENGINE=MYISAM DEFAULT CHARSET=latin1;
 
 #
 # Dumping data for table `staff`
@@ -163,7 +163,7 @@ CREATE TABLE bup_default.wide (
 ) ENGINE=INNODB DEFAULT CHARSET=latin1;
 
 CREATE TABLE bup_default.t1 (a int) engine=innodb;
-CREATE TABLE bup_default.t2 (a int) engine=MEMORY;
+CREATE TABLE bup_default.t2 (a int) engine=MYISAM;
 CREATE TABLE bup_default.t1_blob (a int, b text) engine=innodb;
 
 # Insert some data.