List:Commits« Previous MessageNext Message »
From:Jorgen Loland Date:March 11 2009 7:01am
Subject:bzr commit into mysql-6.0-backup branch (jorgen.loland:2793) Bug#39063
View as plain text  
#At file:///localhome/jl208045/mysql/mysql-6.0-backup-39063/

 2793 Jorgen Loland	2009-03-11 [merge]
      Local merge to push bug#39063
modified:
  .bzr-mysql/default.conf
  mysql-test/suite/backup/include/bml_test.inc
  mysql-test/suite/backup/r/backup_bml.result
  mysql-test/suite/backup/r/backup_objects_dependency.result
  mysql-test/suite/backup/t/backup_objects_dependency.test
  mysql-test/suite/backup_engines/t/backup_partitioning.test
  sql/backup/kernel.cc
  sql/backup/stream_v1.c
  sql/backup/stream_v1_services.h
  sql/share/errmsg.txt
  sql/sql_class.h

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-03-09 14:00:03 +0000
+++ b/.bzr-mysql/default.conf	2009-03-10 14:51:20 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-backup
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-6.0"
+tree_name = "mysql-6.0-backup"

=== modified file 'mysql-test/suite/backup/include/bml_test.inc'
--- a/mysql-test/suite/backup/include/bml_test.inc	2009-02-13 13:25:43 +0000
+++ b/mysql-test/suite/backup/include/bml_test.inc	2009-03-10 16:18:25 +0000
@@ -275,7 +275,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
          connection con5;
          --echo # con5: Reaping BACKUP/RESTORE
          reap;
-         SET debug="-d";
 
      connection con3;
      --echo # con3: Completing DDL3
@@ -317,3 +316,8 @@ SET DEBUG_SYNC= 'reset';
 
 let $backup_to=;
 let $restore_from=;
+
+connection con5;
+  SET debug="-d";
+
+

=== modified file 'mysql-test/suite/backup/r/backup_bml.result'
--- a/mysql-test/suite/backup/r/backup_bml.result	2009-02-20 17:42:11 +0000
+++ b/mysql-test/suite/backup/r/backup_bml.result	2009-03-10 16:18:25 +0000
@@ -292,7 +292,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -327,6 +326,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 
 ########################################################
 # Running BML test for the following statements:
@@ -527,7 +527,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -562,6 +561,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 CREATE VIEW v1 AS SELECT * FROM t2;
 DROP TRIGGER r1;
 DROP EVENT e1;
@@ -761,7 +761,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -795,6 +794,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 
 ########################################################
 # Running BML test for the following statements:
@@ -991,7 +991,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -1025,6 +1024,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 CREATE TRIGGER r1 AFTER UPDATE ON t2 FOR EACH ROW SET @foo=1;
 RESTORE FROM 'bml_test_orig.bkp' OVERWRITE;
 backup_id
@@ -1275,7 +1275,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -1314,6 +1313,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 RESTORE FROM 'bml_test_orig.bkp'  OVERWRITE;
 backup_id
 501
@@ -1527,7 +1527,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -1566,6 +1565,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 RESTORE FROM 'bml_test_orig.bkp'  OVERWRITE;
 backup_id
 501
@@ -1779,7 +1779,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -1818,6 +1817,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 RESTORE FROM 'bml_test_orig.bkp'  OVERWRITE;
 backup_id
 501
@@ -2031,7 +2031,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -2069,6 +2068,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 RESTORE FROM 'bml_test_orig.bkp'  OVERWRITE;
 backup_id
 501
@@ -2290,7 +2290,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -2320,6 +2319,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 
 ########################################################
 # Running BML test for the following statements:
@@ -2502,7 +2502,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -2534,6 +2533,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 
 ########################################################
 # Running BML test for the following statements:
@@ -2718,7 +2718,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -2746,6 +2745,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 DROP USER bml_u3;
 CALL test.check_results();
 Tables_in_bml_test
@@ -2958,7 +2958,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 # con4: Completing DDL4
 
@@ -2989,6 +2988,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (3);
 
@@ -3175,7 +3175,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_bup';
 # con5: Reaping BACKUP/RESTORE
 backup_id
 500
-SET debug="-d";
 # con3: Completing DDL3
 Table	Op	Msg_type	Msg_text
 bml_test.t1	repair	status	OK
@@ -3210,6 +3209,7 @@ SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
 SET DEBUG_SYNC= 'reset';
+SET debug="-d";
 DROP DATABASE bml_test;
 DROP PROCEDURE test.check_results;
 

=== modified file 'mysql-test/suite/backup/r/backup_objects_dependency.result'
--- a/mysql-test/suite/backup/r/backup_objects_dependency.result	2009-03-03 22:15:16 +0000
+++ b/mysql-test/suite/backup/r/backup_objects_dependency.result	2009-03-11 01:14:44 +0000
@@ -536,9 +536,6 @@ Table	Create Table
 tp	CREATE TABLE `tp` (
   `a` varchar(4) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
 CALL show_objects('ob1');
 TABLE_NAME	TABLE_TYPE
 t11	BASE TABLE
@@ -848,10 +845,6 @@ Table	Create Table
 tp	CREATE TABLE `tp` (
   `a` varchar(4) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
-2	user2 created
 
 CREATE DEPENDENT TESTS
 ======================
@@ -1131,9 +1124,6 @@ cash	1000
 dd	2000
 dd	2000
 dd	2000
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
 
 # Drop the procedure(ob1.p11) in which procedure(ob2.p23) depends
 Perform restore again to get all objects back.
@@ -1824,9 +1814,6 @@ collation_connection	#
 Database Collation	latin1_swedish_ci
 CALL ob3.fire('user3 created');
 ERROR 42S02: Table 'ob3.msg' doesn't exist
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
 # Test cleanup section
 REVOKE ALL ON *.* FROM tom@'%';
 DROP USER tom@'%';

=== modified file 'mysql-test/suite/backup/t/backup_objects_dependency.test'
--- a/mysql-test/suite/backup/t/backup_objects_dependency.test	2009-03-03 22:15:16 +0000
+++ b/mysql-test/suite/backup/t/backup_objects_dependency.test	2009-03-11 01:14:44 +0000
@@ -432,8 +432,12 @@ SHOW CREATE TABLE ob3.tp;
 SHOW CREATE TABLE ob2.t23;
 SHOW CREATE TABLE ob3.tp;
 
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
 # Verify event ob3.ev is fired
-SELECT * FROM ob3.log;
+#SELECT * FROM ob3.log;
 
 # Checking tables and other objects in databases.
 CALL show_objects('ob1');
@@ -523,7 +527,12 @@ CALL ob3.p31('TEST');
 SHOW CREATE TABLE ob3.tp;
 SHOW CREATE TABLE ob2.t23;
 SHOW CREATE TABLE ob3.tp;
-SELECT * FROM ob3.log;
+
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
+#SELECT * FROM ob3.log;
 
 --echo
 --echo CREATE DEPENDENT TESTS
@@ -636,7 +645,13 @@ GRANT ALL ON *.* TO tom@'%';
 INSERT INTO ob3.t32 VALUES(97);
 SELECT * FROM ob3.t32;
 SELECT * FROM ob1.t14;
-SELECT * FROM ob3.log;
+
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
+#SELECT * FROM ob3.log;
+
 # Note that we will see both values 97 and 98. trg32 will not update value
 # in t14 if user is not present.
 # Note that if user is not present, event will not be fired
@@ -723,7 +738,12 @@ Let $db=ob3;
 # Try to fire event
 --error ER_NO_SUCH_TABLE
 CALL ob3.fire('user3 created');
-SELECT * FROM ob3.log;
+
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
+#SELECT * FROM ob3.log;
 
 --echo # Test cleanup section
 

=== modified file 'mysql-test/suite/backup_engines/t/backup_partitioning.test'
--- a/mysql-test/suite/backup_engines/t/backup_partitioning.test	2009-03-10 07:58:27 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_partitioning.test	2009-03-10 08:45:35 +0000
@@ -7,6 +7,7 @@
 # character set.
 ###############################################################################
 --source include/not_embedded.inc
+--source include/have_partition.inc
 --source suite/backup_engines/include/backup_engine.inc
 --source suite/backup_engines/include/not_csv.inc
 

=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc	2009-03-06 09:49:05 +0000
+++ b/sql/backup/kernel.cc	2009-03-10 18:19:41 +0000
@@ -2231,7 +2231,7 @@ int bcat_get_item_create_data(st_bstream
                             bstream_blob *data)
 {
   /* We don't use any extra data now */
-  return BSTREAM_ERROR;
+  return BSTREAM_EOS;
 }
 
 

=== modified file 'sql/backup/stream_v1.c'
--- a/sql/backup/stream_v1.c	2009-02-11 08:12:45 +0000
+++ b/sql/backup/stream_v1.c	2009-03-10 18:19:41 +0000
@@ -1629,21 +1629,27 @@ int bstream_wr_item_def(backup_stream *s
   data.end= 0;
   query.begin= 0;
   query.end= 0;
+
+  /* 
+    Fetch item's create query and/or extra metadata data. Note that
+    the BSTREAM_EOS reply from bcat_get_item_create_*() functions
+    indicates lack of the corresponding piece of metadata.
+  */
+
   ret= bcat_get_item_create_query(cat,item,&query);
   if (ret == BSTREAM_OK) 
     flags |= BSTREAM_FLAG_HAS_CREATE_STMT;
   else if (ret == BSTREAM_ERROR) 
     goto wr_error;
 
-  /* bcat_get_item_create_data not in use yet. */
-  /*
   ret= bcat_get_item_create_data(cat,item,&data);
   if (ret == BSTREAM_OK)
     flags |= BSTREAM_FLAG_HAS_EXTRA_DATA;
   else if (ret == BSTREAM_ERROR) 
     goto wr_error;
-  */
   
+  /* save the header of metadata entry, containing item coordinates */
+
   ret= bstream_wr_meta_item(s,kind,flags,item);
   if (ret == BSTREAM_ERROR) 
     goto wr_error;

=== modified file 'sql/backup/stream_v1_services.h'
--- a/sql/backup/stream_v1_services.h	2007-11-29 19:58:12 +0000
+++ b/sql/backup/stream_v1_services.h	2009-03-10 18:19:41 +0000
@@ -133,7 +133,8 @@ void  bcat_db_iterator_free(struct st_bs
   part of meta-data.
 
   @retval BSTREAM_OK    blob @c stmt contains the CREATE query
-  @retval BSTREAM_ERROR no CREATE statement for that item
+  @retval BSTREAM_EOS   no CREATE statement for that item
+  @retval BSTREAM_ERROR error when obtaining metadata for the item
 */
 int bcat_get_item_create_query(struct st_bstream_image_header *catalogue,
                                struct st_bstream_item_info *item,
@@ -146,8 +147,9 @@ int bcat_get_item_create_query(struct st
   meta-data. If function returns successfully, the bytes returned become
   part of meta-data.
 
-  @retval BSTREAM_OK    blob @c data contains the meta-data
-  @retval BSTREAM_ERROR no extra meta-data for that item
+  @retval BSTREAM_OK    blob @c data contains the metadata
+  @retval BSTREAM_EOS   no extra metadata for that item
+  @retval BSTREAM_ERROR error when obtaining metadata for the item
 */
 int bcat_get_item_create_data(struct st_bstream_image_header *catalogue,
                               struct st_bstream_item_info *item,

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2009-03-09 19:33:47 +0000
+++ b/sql/share/errmsg.txt	2009-03-10 20:12:44 +0000
@@ -6463,8 +6463,6 @@ ER_OPERATION_ABORTED
   eng "Operation aborted"
 ER_OPERATION_ABORTED_CORRUPTED
   eng "Operation aborted - data might be corrupted"
-ER_PATH_LENGTH
-  eng "The path specified for %.64s is too long."
 ER_DUP_SIGNAL_SET 42000
         eng "Duplicate condition information item '%s'"
 
@@ -6491,4 +6489,6 @@ WARN_COND_ITEM_TRUNCATED
 
 ER_COND_ITEM_TOO_LONG
         eng "Data too long for condition item '%s'"
+ER_PATH_LENGTH
+  eng "The path specified for %.64s is too long."
 

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2009-03-09 14:00:03 +0000
+++ b/sql/sql_class.h	2009-03-10 14:14:23 +0000
@@ -3174,12 +3174,6 @@ public:
   modifies our currently non-transactional system tables.
 */
 #define CF_AUTO_COMMIT_TRANS  (CF_IMPLICT_COMMIT_BEGIN | CF_IMPLICIT_COMMIT_END)
-/**
-  Mark statements which shuld be blocked when the Backup Metadata Lock is
-  active. See bml.cc.
-*/ 
-#define CF_BLOCKED_BY_BML       (1U << 8)
-
 
 /**
   Diagnostic statement.
@@ -3191,6 +3185,12 @@ public:
 */
 #define CF_DIAGNOSTIC_STMT        (1U << 8)
 
+/**
+  Mark statements which shuld be blocked when the Backup Metadata Lock is
+  active. See bml.cc.
+*/ 
+#define CF_BLOCKED_BY_BML       (1U << 9)
+
 /* Bits in server_command_flags */
 
 /**

Thread
bzr commit into mysql-6.0-backup branch (jorgen.loland:2793) Bug#39063Jorgen Loland11 Mar