MySQL Lists: commits: bk commit into 6.0 tree (cbell:1.2704)

List:	Commits	« Previous Message Next Message »
From:	cbell	Date:	November 30 2007 5:22am
Subject:	bk commit into 6.0 tree (cbell:1.2704)
View as plain text
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-11-29 23:22:11-05:00, cbell@mysql_cab_desk. +16 -0
  Merge mysql-6.0 --> mysql-6.0-backup testing corrections
    
  Tests modified to remove them from embedded server testing and
  fix test failures on some machines.

  mysql-test/r/backup.result@stripped, 2007-11-29 23:21:55-05:00, cbell@mysql_cab_desk. +2 -2
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    New result file.

  mysql-test/r/backup_fkey.result@stripped, 2007-11-29 23:21:56-05:00, cbell@mysql_cab_desk. +1
-1
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    New result file.

  mysql-test/r/backup_progress.result@stripped, 2007-11-29 23:21:56-05:00,
cbell@mysql_cab_desk. +1 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    New result file.

  mysql-test/r/backup_security.result@stripped, 2007-11-29 23:21:57-05:00,
cbell@mysql_cab_desk. +3 -3
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    New result file.

  mysql-test/t/backup.test@stripped, 2007-11-29 23:21:58-05:00, cbell@mysql_cab_desk. +4 -3
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_commit_blocker.test@stripped, 2007-11-29 23:21:58-05:00,
cbell@mysql_cab_desk. +1 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_ddl_blocker.test@stripped, 2007-11-29 23:21:59-05:00,
cbell@mysql_cab_desk. +1 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_errors.test@stripped, 2007-11-29 23:22:00-05:00, cbell@mysql_cab_desk. +2
-0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_fkey.test@stripped, 2007-11-29 23:22:00-05:00, cbell@mysql_cab_desk. +2
-1
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_no_data.test@stripped, 2007-11-29 23:22:01-05:00, cbell@mysql_cab_desk.
+2 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_no_engine.test@stripped, 2007-11-29 23:22:02-05:00, cbell@mysql_cab_desk.
+2 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_progress.test@stripped, 2007-11-29 23:22:02-05:00, cbell@mysql_cab_desk.
+4 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_security.test@stripped, 2007-11-29 23:22:03-05:00, cbell@mysql_cab_desk.
+5 -3
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  mysql-test/t/backup_snapshot.test@stripped, 2007-11-29 23:22:04-05:00, cbell@mysql_cab_desk.
+1 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  sql/backup/be_snapshot.cc@stripped, 2007-11-29 23:22:05-05:00, cbell@mysql_cab_desk. +2 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

  sql/sql_delete.cc@stripped, 2007-11-29 23:22:05-05:00, cbell@mysql_cab_desk. +2 -0
    Merge mysql-6.0 --> mysql-6.0-backup testing corrections
        
    Corrected test for PB errors in mysql-6.0-backup.

diff -Nrup a/mysql-test/r/backup.result b/mysql-test/r/backup.result
--- a/mysql-test/r/backup.result	2007-11-29 20:40:23 -05:00
+++ b/mysql-test/r/backup.result	2007-11-29 23:21:55 -05:00
@@ -13,7 +13,7 @@ Note	1051	Unknown table 'building'
 CREATE TABLE `building` (
 `dir_code` char(4),
 `building` char(6)
-) ENGINE=archive 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;
@@ -24,7 +24,7 @@ CREATE TABLE `directorate` (
 `dir_code` char(4),
 `dir_name` char(30),
 `dir_head_id` char(9)
-) ENGINE=archive 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;
diff -Nrup a/mysql-test/r/backup_fkey.result b/mysql-test/r/backup_fkey.result
--- a/mysql-test/r/backup_fkey.result	2007-11-29 20:40:25 -05:00
+++ b/mysql-test/r/backup_fkey.result	2007-11-29 23:21:56 -05:00
@@ -66,7 +66,7 @@ id	parent_id
 DROP TABLE backup_fkey.child, backup_fkey.parent;
 Test 2:
 Create table and add data.
-CREATE TABLE backup_fkey.t1 (a char(40));
+CREATE TABLE backup_fkey.t1 (a char(40)) ENGINE=MEMORY;
 INSERT INTO backup_fkey.t1 VALUES ("01 Test #2 - foreign key constraints");
 INSERT INTO backup_fkey.t1 VALUES ("02 Test #2 - foreign key constraints");
 INSERT INTO backup_fkey.t1 VALUES ("03 Test #2 - foreign key constraints");
diff -Nrup a/mysql-test/r/backup_progress.result b/mysql-test/r/backup_progress.result
--- a/mysql-test/r/backup_progress.result	2007-11-29 20:40:35 -05:00
+++ b/mysql-test/r/backup_progress.result	2007-11-29 23:21:56 -05:00
@@ -1,5 +1,6 @@
 DROP DATABASE IF EXISTS backup_progress;
 DROP TABLE IF EXISTS backup_progress.t1_res;
+SET GLOBAL debug="d,backup_debug";
 CREATE DATABASE backup_progress;
 con1: Create table and new users.
 CREATE TABLE backup_progress.t1 (a char(30)) ENGINE=MYISAM;
diff -Nrup a/mysql-test/r/backup_security.result b/mysql-test/r/backup_security.result
--- a/mysql-test/r/backup_security.result	2007-11-29 20:40:27 -05:00
+++ b/mysql-test/r/backup_security.result	2007-11-29 23:21:57 -05:00
@@ -34,7 +34,7 @@ ERROR 42000: Access denied; you need the
 SHOW ERRORS;
 Level	Code	Message
 Error	1227	Access denied; you need the SUPER privilege for this operation
-SELECT * FROM t1;
+SELECT * FROM backup_test.t1;
 a
 01 Test #1 - super privilege
 02 Test #1 - super privilege
@@ -52,7 +52,7 @@ no_rights: Attempting restore. Should su
 RESTORE FROM 'bup_with_rights.bak';
 backup_id
 #
-SELECT * FROM t1;
+SELECT * FROM backup_test.t1;
 a
 01 Test #1 - super privilege
 02 Test #1 - super privilege
@@ -65,7 +65,7 @@ default: Do restore to ensure it still w
 RESTORE FROM 'backup_test_orig.bak';
 backup_id
 #
-SELECT * FROM t1;
+SELECT * FROM backup_test.t1;
 a
 01 Test #1 - super privilege
 02 Test #1 - super privilege
diff -Nrup a/mysql-test/t/backup.test b/mysql-test/t/backup.test
--- a/mysql-test/t/backup.test	2007-11-29 20:40:29 -05:00
+++ b/mysql-test/t/backup.test	2007-11-29 23:21:58 -05:00
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/not_embedded.inc
 
 connect (backup,localhost,root,,);
 connect (restore,localhost,root,,);
@@ -15,13 +16,13 @@ USE db1;
 
 # SHOW ENGINES;
 
-#SET @@storage_engine = 'archive';
+#SET @@storage_engine = 'myisam';
 
 DROP TABLE IF EXISTS `building`;
 CREATE TABLE `building` (
   `dir_code` char(4),
   `building` char(6)
-) ENGINE=archive DEFAULT CHARSET=latin1;
+) ENGINE=myisam DEFAULT CHARSET=latin1;
 
 #
 # Dumping data for table `building`
@@ -41,7 +42,7 @@ CREATE TABLE `directorate` (
   `dir_code` char(4),
   `dir_name` char(30),
   `dir_head_id` char(9)
-) ENGINE=archive DEFAULT CHARSET=latin1;
+) ENGINE=myisam DEFAULT CHARSET=latin1;
 
 #
 # Dumping data for table `directorate`
diff -Nrup a/mysql-test/t/backup_commit_blocker.test
b/mysql-test/t/backup_commit_blocker.test
--- a/mysql-test/t/backup_commit_blocker.test	2007-11-29 22:20:42 -05:00
+++ b/mysql-test/t/backup_commit_blocker.test	2007-11-29 23:21:58 -05:00
@@ -42,6 +42,7 @@
 
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/not_embedded.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS bup_commit_blocker;
diff -Nrup a/mysql-test/t/backup_ddl_blocker.test b/mysql-test/t/backup_ddl_blocker.test
--- a/mysql-test/t/backup_ddl_blocker.test	2007-11-29 22:20:42 -05:00
+++ b/mysql-test/t/backup_ddl_blocker.test	2007-11-29 23:21:59 -05:00
@@ -51,6 +51,7 @@
 
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/not_embedded.inc
 
 #
 # Connections used in this test
diff -Nrup a/mysql-test/t/backup_errors.test b/mysql-test/t/backup_errors.test
--- a/mysql-test/t/backup_errors.test	2007-11-06 13:32:25 -05:00
+++ b/mysql-test/t/backup_errors.test	2007-11-29 23:22:00 -05:00
@@ -1,3 +1,5 @@
+--source include/not_embedded.inc
+
 DROP DATABASE IF EXISTS adb;
 DROP DATABASE IF EXISTS bdb;
 
diff -Nrup a/mysql-test/t/backup_fkey.test b/mysql-test/t/backup_fkey.test
--- a/mysql-test/t/backup_fkey.test	2007-11-29 20:40:31 -05:00
+++ b/mysql-test/t/backup_fkey.test	2007-11-29 23:22:00 -05:00
@@ -10,6 +10,7 @@
 #
 
 --source include/have_innodb.inc
+--source include/not_embedded.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS backup_fkey;
@@ -93,7 +94,7 @@ DROP TABLE backup_fkey.child, backup_fke
 #
 --echo Test 2:
 --echo Create table and add data.
-CREATE TABLE backup_fkey.t1 (a char(40));
+CREATE TABLE backup_fkey.t1 (a char(40)) ENGINE=MEMORY;
 
 INSERT INTO backup_fkey.t1 VALUES ("01 Test #2 - foreign key constraints"); 
 INSERT INTO backup_fkey.t1 VALUES ("02 Test #2 - foreign key constraints"); 
diff -Nrup a/mysql-test/t/backup_no_data.test b/mysql-test/t/backup_no_data.test
--- a/mysql-test/t/backup_no_data.test	2007-11-29 20:40:32 -05:00
+++ b/mysql-test/t/backup_no_data.test	2007-11-29 23:22:01 -05:00
@@ -1,3 +1,5 @@
+--source include/not_embedded.inc
+
 connect (backup,localhost,root,,);
 connect (restore,localhost,root,,);
 
diff -Nrup a/mysql-test/t/backup_no_engine.test b/mysql-test/t/backup_no_engine.test
--- a/mysql-test/t/backup_no_engine.test	2007-11-29 20:40:32 -05:00
+++ b/mysql-test/t/backup_no_engine.test	2007-11-29 23:22:02 -05:00
@@ -1,6 +1,8 @@
 # Test how online backup handles tables using non-existent storage engines
 # The server used to crash in this situation (BUG#30938)
 
+--source include/not_embedded.inc
+
 # .frm file for a table using non-existent storage engine
 --let $table_def=$MYSQL_TEST_DIR/std_data/bug30938.frm
 --let $backup_out_path=$MYSQLTEST_VARDIR/master-data
diff -Nrup a/mysql-test/t/backup_progress.test b/mysql-test/t/backup_progress.test
--- a/mysql-test/t/backup_progress.test	2007-11-29 20:40:34 -05:00
+++ b/mysql-test/t/backup_progress.test	2007-11-29 23:22:02 -05:00
@@ -6,6 +6,7 @@
 source include/have_log_bin.inc;
 source include/have_debug.inc;
 source include/have_innodb.inc;
+source include/not_embedded.inc;
 
 --disable_warnings
 DROP DATABASE IF EXISTS backup_progress;
@@ -14,6 +15,9 @@ DROP TABLE IF EXISTS backup_progress.t1_
 
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
+
+# Setup the server to use the backup breakpoints
+SET GLOBAL debug="d,backup_debug";
 
 #
 # Test 1 - Check output of backup.
diff -Nrup a/mysql-test/t/backup_security.test b/mysql-test/t/backup_security.test
--- a/mysql-test/t/backup_security.test	2007-11-29 20:40:33 -05:00
+++ b/mysql-test/t/backup_security.test	2007-11-29 23:22:03 -05:00
@@ -5,6 +5,8 @@
 # 1) Only users with super privilege can run backup or restore.
 #
 
+--source include/not_embedded.inc
+
 --disable_warnings
 DROP DATABASE IF EXISTS backup_test;
 --enable_warnings
@@ -59,7 +61,7 @@ SHOW ERRORS;
 RESTORE FROM 'bup_no_rights.bak';
 SHOW ERRORS;
 
-SELECT * FROM t1;
+SELECT * FROM backup_test.t1;
 
 --echo Connect as user with rights and attempt backup and restore.
 
@@ -74,7 +76,7 @@ BACKUP DATABASE backup_test to 'bup_with
 --replace_column 1 #
 RESTORE FROM 'bup_with_rights.bak';
 
-SELECT * FROM t1;
+SELECT * FROM backup_test.t1;
 
 connection default;
 
@@ -83,7 +85,7 @@ connection default;
 --replace_column 1 #
 RESTORE FROM 'backup_test_orig.bak';
 
-SELECT * FROM t1;
+SELECT * FROM backup_test.t1;
 
 --echo Cleanup
 
diff -Nrup a/mysql-test/t/backup_snapshot.test b/mysql-test/t/backup_snapshot.test
--- a/mysql-test/t/backup_snapshot.test	2007-11-29 22:20:43 -05:00
+++ b/mysql-test/t/backup_snapshot.test	2007-11-29 23:22:04 -05:00
@@ -28,6 +28,7 @@
 
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/not_embedded.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS bup_snapshot;
diff -Nrup a/sql/backup/be_snapshot.cc b/sql/backup/be_snapshot.cc
--- a/sql/backup/be_snapshot.cc	2007-11-28 22:13:06 -05:00
+++ b/sql/backup/be_snapshot.cc	2007-11-29 23:22:05 -05:00
@@ -106,7 +106,9 @@ result_t Backup::get_data(Buffer &buf)
     tables_open= TRUE;
   }
   if (locking_thd->lock_state == LOCK_ACQUIRED)
+  {
     BACKUP_BREAKPOINT("backup_cs_reading");
+  }
 
   res= default_backup::Backup::get_data(buf);
 
diff -Nrup a/sql/sql_delete.cc b/sql/sql_delete.cc
--- a/sql/sql_delete.cc	2007-11-27 09:04:41 -05:00
+++ b/sql/sql_delete.cc	2007-11-29 23:22:05 -05:00
@@ -395,7 +395,9 @@ cleanup:
     Breakpoints for backup testing.
   */
   if (!table->file->has_transactions())
+  {
     BACKUP_BREAKPOINT("backup_commit_blocker");
+  }
 
   if (thd->lock)
   {
Thread
• bk commit into 6.0 tree (cbell:1.2704)	cbell	30 Nov