bzr commit into mysql-5.4-bugfixing branch (jon.hauglid:2802) Bug#36021

[Jon Olav Hauglid]

#At file:///export/home/z/mysql-azalea-bugfixing-bug36021/ based on
revid:alik@stripped

 2802 Jon Olav Hauglid	2009-06-18
      Bug #36021 open_binary_frm() makes server crash with glibc error 
                 "double free or corruptio 
      
      Extra calls to my_free() have already been removed, unable to reproduce.
      
      Re-enabled backup_no_engine test which had been disabled because it 
      triggered this bug. Test case updated to match current backup syntax.

    modified:
      mysql-test/suite/backup/r/backup_no_engine.result
      mysql-test/suite/backup/t/backup_no_engine.test
      mysql-test/suite/backup/t/disabled.def
=== modified file 'mysql-test/suite/backup/r/backup_no_engine.result'
--- a/mysql-test/suite/backup/r/backup_no_engine.result	2008-10-07 17:15:44 +0000
+++ b/mysql-test/suite/backup/r/backup_no_engine.result	2009-06-18 11:28:01 +0000
@@ -1,12 +1,14 @@
 DROP DATABASE IF EXISTS db;
 CREATE DATABASE db;
-CREATE TABLE db.t1 (a int, b char(32))
-ENGINE=MYISAM;
+CREATE TABLE db.t1 (a int, b char(32));
+SHOW TABLES IN db;
+Tables_in_db
+t1
+t2
 BACKUP DATABASE db TO "db.backup";
 backup_id
 #
 DROP DATABASE db;
-CREATE DATABASE db;
 RESTORE FROM "db.backup";
 backup_id
 #

=== modified file 'mysql-test/suite/backup/t/backup_no_engine.test'
--- a/mysql-test/suite/backup/t/backup_no_engine.test	2009-02-24 20:57:21 +0000
+++ b/mysql-test/suite/backup/t/backup_no_engine.test	2009-06-18 11:28:01 +0000
@@ -13,19 +13,19 @@ DROP DATABASE IF EXISTS db;
 --enable_warnings
 
 CREATE DATABASE db;
-CREATE TABLE db.t1 (a int, b char(32))
-;
+CREATE TABLE db.t1 (a int, b char(32));
 
 # copy description of a table using non-existent storage engine
 copy_file $table_def $MYSQLD_DATADIR/db/t2.frm;
 
+SHOW TABLES IN db;
+
 # backup test database, the table with no storage engine will be ignored
 --replace_column 1 #
 BACKUP DATABASE db TO "db.backup";
 
 # wipe-out backed-up database
 DROP DATABASE db;
-CREATE DATABASE db;
 
 --replace_column 1 #
 RESTORE FROM "db.backup";

=== modified file 'mysql-test/suite/backup/t/disabled.def'
--- a/mysql-test/suite/backup/t/disabled.def	2009-04-03 17:58:04 +0000
+++ b/mysql-test/suite/backup/t/disabled.def	2009-06-18 11:28:01 +0000
@@ -9,5 +9,4 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-backup_no_engine              : Bug#36021 2008-04-13 rsomla server crashes when openning
table with unknown storage engine
 backup_no_data                : Bug#42756 2009-02-11 jorgen Test db state not preserved 


Attachment: [text/bzr-bundle] bzr/[e-mail]