List:Commits« Previous MessageNext Message »
From:Anurag Shekhar Date:January 22 2010 9:51am
Subject:bzr commit into mysql-6.0-backup branch (anurag.shekhar:2936) Bug#36635
View as plain text  
#At file:///home/anurag/mysqlsrc/mysql-6.0-backup/ based on revid:sanjay.manwani@stripped

 2936 Anurag Shekhar	2010-01-22
      Bug #36635 Backup: errors should be warnings
      
      Backup was treating non existent database name in backup command as
      error hence stopping the operation even if one or more valid databases
      are specified in the backup command.
      
      Changed the treatment of non existing databases Backup_info::add_dbs,
      from error to warning to allow backup to continue with backup of other 
      valid databases (if any). If none of the databases listed in backup
      command are found valid, an empty backup image will be create (which
      can be restored) and the command will still succeed.
     @ mysql-test/suite/backup/r/backup_dbname_lctn1.result
        Updated tests results according to changes in test case.
     @ mysql-test/suite/backup/r/backup_errors.result
        Updated tests results according to changes in test case.
     @ mysql-test/suite/backup/r/backup_errors_compression.result
        Updated tests results according to changes in test case.
     @ mysql-test/suite/backup/r/backup_errors_debug_1.result
        Updated tests results according to changes in test case.
     @ mysql-test/suite/backup/r/backup_missing_db.result
        Updated tests results according to changes in test case.
     @ mysql-test/suite/backup/r/backup_pipe.result
        Updated tests results according to changes in test case.
     @ mysql-test/suite/backup/r/backup_security.result
        Updated tests results according to changes in test case.
     @ mysql-test/suite/backup/t/backup_dbname_lctn1.test
        Change test case which was expecting error in case of invalid
        database to expect warning instead.
     @ mysql-test/suite/backup/t/backup_errors.test
        Change test case which was expecting error in case of invalid
        database to expect warning instead.
        Added instruction to remove backup image after the test case
        as the image name will be used by other test cases.
     @ mysql-test/suite/backup/t/backup_errors_debug_1.test
        Removed error injection test for 
        ER_BACKUP_NOTHING_TO_BACKUP as this error will not be
        returned any more.
     @ mysql-test/suite/backup/t/backup_missing_db.test
        New tests for testing backup behaviour for missing database
        names.
     @ mysql-test/suite/backup/t/backup_pipe.test
        Change test case which was expecting error in case of invalid
        database to expect warning instead.
     @ mysql-test/suite/backup/t/backup_security.test
        Removed suppression for "Backup: Nothing to backup" as this
        will never be returned.
        Changed the test case which was expecting error in case of invalid database
        name to expect success and added instruction to remove empty backup image.
                
        Retrieving the backup path at the beginning of the test so it be used both
        within the test case and at cleanup.
     @ sql/backup/backup_info.cc
        Removed the code that stopped processing as soon as an unknown 
        database has been found.
        Changed unknown database to warning (from error).
     @ sql/backup/kernel.cc
        Removed code to return ER_BACKUP_NOTHING_TO_BACKUP
        in case of no valid database found to backup.
        If there is no valid database found in the backup 
        command, an empty image will be created.

    added:
      mysql-test/suite/backup/r/backup_missing_db.result
      mysql-test/suite/backup/t/backup_missing_db.test
    modified:
      mysql-test/suite/backup/r/backup_dbname_lctn1.result
      mysql-test/suite/backup/r/backup_errors.result
      mysql-test/suite/backup/r/backup_errors_compression.result
      mysql-test/suite/backup/r/backup_errors_debug_1.result
      mysql-test/suite/backup/r/backup_pipe.result
      mysql-test/suite/backup/r/backup_security.result
      mysql-test/suite/backup/t/backup_dbname_lctn1.test
      mysql-test/suite/backup/t/backup_errors.test
      mysql-test/suite/backup/t/backup_errors_debug_1.test
      mysql-test/suite/backup/t/backup_pipe.test
      mysql-test/suite/backup/t/backup_security.test
      sql/backup/backup_info.cc
      sql/backup/kernel.cc
=== modified file 'mysql-test/suite/backup/r/backup_dbname_lctn1.result'
--- a/mysql-test/suite/backup/r/backup_dbname_lctn1.result	2009-08-27 10:24:21 +0000
+++ b/mysql-test/suite/backup/r/backup_dbname_lctn1.result	2010-01-22 09:51:39 +0000
@@ -233,14 +233,16 @@ Level	Code	Message
 Error	####	Not unique database: 'upper'
 Warning	####	Operation aborted
 #
-# Verify that BACKUP error message has lower case dbname when not found
+# Verify that BACKUP warning message has lower case dbname when not found
 #
 BACKUP DATABASE NoTThErE to 'notthere.bup';
-ERROR 42000: Unknown database 'notthere'
+backup_id
+####
+Warnings:
+Warning	####	Unknown database 'notthere'
 SHOW WARNINGS;
 Level	Code	Message
-Error	####	Unknown database 'notthere'
-Warning	####	Operation aborted
+Warning	####	Unknown database 'notthere'
 #
 # CLEANUP
 #

=== modified file 'mysql-test/suite/backup/r/backup_errors.result'
--- a/mysql-test/suite/backup/r/backup_errors.result	2009-11-26 09:52:48 +0000
+++ b/mysql-test/suite/backup/r/backup_errors.result	2010-01-22 09:51:39 +0000
@@ -100,28 +100,34 @@ complete
 DROP DATABASE IF EXISTS foo;
 DROP DATABASE IF EXISTS bar;
 BACKUP DATABASE foo TO 'test.bak' ;
-ERROR 42000: Unknown database 'foo'
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'foo'
 SHOW WARNINGS;
 Level	Code	Message
-Error	#	Unknown database 'foo'
-Warning	#	Operation aborted
+Warning	#	Unknown database 'foo'
 PURGE BACKUP LOGS;
 BACKUP DATABASE test,foo,bdb,bar TO 'test.bak' ;
-ERROR 42000: Unknown database 'foo,bar'
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'foo,bar'
 SHOW WARNINGS;
 Level	Code	Message
-Error	#	Unknown database 'foo,bar'
-Warning	#	Operation aborted
+Warning	#	Unknown database 'foo,bar'
 verify backup history and progress logs:
 SELECT backup_state,operation,backup_file, command FROM mysql.backup_history;
 backup_state	operation	backup_file	command
-error	backup	test.bak	BACKUP DATABASE test,foo,bdb,bar TO 'test.bak'
+complete	backup	test.bak	BACKUP DATABASE test,foo,bdb,bar TO 'test.bak'
 SELECT notes FROM mysql.backup_progress;
 notes
 starting
 running
-Unknown database 'foo,bar'
-error
+validity point
+vp time
+running
+complete
 PURGE BACKUP LOGS;
 CREATE DATABASE foo;
 CREATE DATABASE bar;

=== modified file 'mysql-test/suite/backup/r/backup_errors_compression.result'
--- a/mysql-test/suite/backup/r/backup_errors_compression.result	2009-11-26 09:52:48 +0000
+++ b/mysql-test/suite/backup/r/backup_errors_compression.result	2010-01-22 09:51:39 +0000
@@ -100,28 +100,16 @@ complete
 DROP DATABASE IF EXISTS foo;
 DROP DATABASE IF EXISTS bar;
 BACKUP DATABASE foo TO 'test.bak' WITH COMPRESSION;
-ERROR 42000: Unknown database 'foo'
-SHOW WARNINGS;
-Level	Code	Message
-Error	#	Unknown database 'foo'
-Warning	#	Operation aborted
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'foo'
 PURGE BACKUP LOGS;
-BACKUP DATABASE test,foo,bdb,bar TO 'test.bak' WITH COMPRESSION;
-ERROR 42000: Unknown database 'foo,bar'
-SHOW WARNINGS;
-Level	Code	Message
-Error	#	Unknown database 'foo,bar'
-Warning	#	Operation aborted
 verify backup history and progress logs:
 SELECT backup_state,operation,backup_file, command FROM mysql.backup_history;
 backup_state	operation	backup_file	command
-error	backup	test.bak	BACKUP DATABASE test,foo,bdb,bar TO 'test.bak' WITH COMPRESSION
 SELECT notes FROM mysql.backup_progress;
 notes
-starting
-running
-Unknown database 'foo,bar'
-error
 PURGE BACKUP LOGS;
 CREATE DATABASE foo;
 CREATE DATABASE bar;

=== modified file 'mysql-test/suite/backup/r/backup_errors_debug_1.result'
--- a/mysql-test/suite/backup/r/backup_errors_debug_1.result	2009-11-24 16:47:23 +0000
+++ b/mysql-test/suite/backup/r/backup_errors_debug_1.result	2010-01-22 09:51:39 +0000
@@ -864,44 +864,8 @@ backup_id
 #
 # Done.
 #
-#
-# Test case 19 - testing error ER_BACKUP_NOTHING_TO_BACKUP
-#
-# Set debug SESSION variable for ER_BACKUP_NOTHING_TO_BACKUP
-#
-SET SESSION debug="+d,ER_BACKUP_NOTHING_TO_BACKUP";
-#
-# Execute backup
-#
-BACKUP DATABASE backup_test TO 'backup_test_err.bak';
-ERROR HY000: Nothing to backup
-#
-# Test case for error ER_BACKUP_NOTHING_TO_BACKUP PASSED.
-#
-#
-# Show warning/error from progress and history log
-# if they exist.
-#
-SELECT * FROM mysql.backup_progress WHERE error_num <> 0;
-backup_id	object	error_num	notes
-#		####	Nothing to backup
-PURGE BACKUP LOGS;
-#
-# Turn off debug SESSION.
-#
-SET SESSION debug="-d";
-#
-# Now demonstrate that the command will work without the
-# debug session tag.
-#
-# Running backup - should not fail.
-#
-BACKUP DATABASE backup_test TO 'backup_test_err.bak';
-backup_id
-#
-#
-# Done.
-#
+# dropped test for error ER_BACKUP_NOTHING_TO_BACKUP (19).
+# leaving the gap in test case to avoid merge conflicts.
 #
 # Test case 20 - testing error ER_BACKUP_BACKUP
 #

=== added file 'mysql-test/suite/backup/r/backup_missing_db.result'
--- a/mysql-test/suite/backup/r/backup_missing_db.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup/r/backup_missing_db.result	2010-01-22 09:51:39 +0000
@@ -0,0 +1,66 @@
+#
+# Bug #36635 Backup: errors should be warnings
+#
+# Create Database and object view for this test.
+DROP DATABASE IF EXISTS db1;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INTEGER);
+INSERT INTO t1 (i) VALUES (1), (2), (3), (4), (5);
+SELECT i FROM t1;
+i
+1
+2
+3
+4
+5
+# Suppress warnings from backup
+call mtr.add_suppression("Backup: Unknown database");
+# Start tests
+# Case 1: Backing up an invalid database, should create
+#         empty image with warning ER_BAD_DB_ERROR
+BACKUP DATABASE no_such_database TO 'bmdb.bak';
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'no_such_database'
+# restore from empty image
+RESTORE FROM 'bmdb.bak' OVERWRITE;
+backup_id
+#
+# Case 2: Backing up two databases, first being invalid
+BACKUP DATABASE no_such_database, db# TO 'bmdb.bak';
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'no_such_database'
+# Restore the database
+RESTORE FROM 'bmdb.bak' OVERWRITE;
+backup_id
+#
+SELECT i FROM t1;
+i
+1
+2
+3
+4
+5
+# Case 3: Backing up two databases, second being invalid
+BACKUP DATABASE db#, no_such_database  TO 'bmdb.bak';
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'no_such_database'
+# Restore the database
+RESTORE FROM 'bmdb.bak' OVERWRITE;
+backup_id
+#
+SELECT i FROM t1;
+i
+1
+2
+3
+4
+5
+# Cleanup
+DROP DATABASE db1;

=== modified file 'mysql-test/suite/backup/r/backup_pipe.result'
--- a/mysql-test/suite/backup/r/backup_pipe.result	2009-08-11 11:09:31 +0000
+++ b/mysql-test/suite/backup/r/backup_pipe.result	2010-01-22 09:51:39 +0000
@@ -33,7 +33,11 @@ BACKUP DATABASE db_non_existent TO 'db1_
 con2:
 Cat the output to a file.
 con1:
-ERROR 42000: Unknown database 'db_non_existent'
+# replace all the numbers in output (backup id and warning number)
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'db_non_existent'
 Check that the pipe is still there and remove the file.
 con1:
 PURGE BACKUP LOGS;

=== modified file 'mysql-test/suite/backup/r/backup_security.result'
--- a/mysql-test/suite/backup/r/backup_security.result	2009-12-16 18:10:45 +0000
+++ b/mysql-test/suite/backup/r/backup_security.result	2010-01-22 09:51:39 +0000
@@ -16,6 +16,7 @@ Variable_name	Value
 restore_precheck	ON
 DROP DATABASE IF EXISTS backup_test;
 DROP DATABASE IF EXISTS backup_test_alt;
+# get backup directory path
 #
 # Use the basic data setup in backup_test database.
 #
@@ -414,14 +415,14 @@ ERROR HY000: Insufficient privileges. Yo
 #          another, the user cannot perform a backup of both databases.
 #
 #
-# conn_user1: Attempting backup. Should fail with 
-# error ER_BAD_DB_ERROR
+# conn_user1: Attempting backup. Should succeed with 
+# warning ER_BAD_DB_ERROR,
 #
 BACKUP DATABASE backup_test_alt to 'bup_no_priv.bak';
-ERROR 42000: Unknown database 'backup_test_alt'
-SHOW ERRORS;
-Level	Code	Message
-Error	#	Unknown database 'backup_test_alt'
+backup_id
+#
+Warnings:
+Warning	#	Unknown database 'backup_test_alt'
 #
 # conn_user1: Attempting backup. Should fail with 
 # error ER_BACKUP_ACCESS_DENIED_ERROR

=== modified file 'mysql-test/suite/backup/t/backup_dbname_lctn1.test'
--- a/mysql-test/suite/backup/t/backup_dbname_lctn1.test	2009-08-27 10:24:21 +0000
+++ b/mysql-test/suite/backup/t/backup_dbname_lctn1.test	2010-01-22 09:51:39 +0000
@@ -182,10 +182,10 @@ BACKUP DATABASE upper, UPPER to 'notuniq
 SHOW WARNINGS;
 
 --echo #
---echo # Verify that BACKUP error message has lower case dbname when not found
+--echo # Verify that BACKUP warning message has lower case dbname when not found
 --echo #
 
---error ER_BAD_DB_ERROR
+--replace_regex /[0000-9999]+/####/
 BACKUP DATABASE NoTThErE to 'notthere.bup';
 --replace_regex /[0000-9999]+/####/
 SHOW WARNINGS;

=== modified file 'mysql-test/suite/backup/t/backup_errors.test'
--- a/mysql-test/suite/backup/t/backup_errors.test	2009-11-26 09:52:48 +0000
+++ b/mysql-test/suite/backup/t/backup_errors.test	2010-01-22 09:51:39 +0000
@@ -108,16 +108,18 @@ DROP DATABASE IF EXISTS foo;
 DROP DATABASE IF EXISTS bar;
 --enable_warnings
 
--- error ER_BAD_DB_ERROR
+--replace_regex /[0-9]+/#/
 eval BACKUP DATABASE foo TO 'test.bak' $compression;
 --replace_column 2 #
 SHOW WARNINGS;
+--remove_file $MYSQLD_DATADIR/test.bak
 
 PURGE BACKUP LOGS;
--- error ER_BAD_DB_ERROR
+--replace_regex /[0-9]+/#/
 eval BACKUP DATABASE test,foo,bdb,bar TO 'test.bak' $compression;
 --replace_column 2 #
 SHOW WARNINGS;
+--remove_file $MYSQLD_DATADIR/test.bak
 
 --echo verify backup history and progress logs:
 SELECT backup_state,operation,backup_file, command FROM mysql.backup_history;

=== modified file 'mysql-test/suite/backup/t/backup_errors_debug_1.test'
--- a/mysql-test/suite/backup/t/backup_errors_debug_1.test	2009-09-10 16:04:27 +0000
+++ b/mysql-test/suite/backup/t/backup_errors_debug_1.test	2010-01-22 09:51:39 +0000
@@ -49,6 +49,7 @@
 # 18. ER_RESTORE_CANNOT_START_SLAVE 
 #     Note: This case is in rpl_backup_errors_debug test.
 # 19. ER_BACKUP_NOTHING_TO_BACKUP
+#     Note: This error won't happen any more 
 # 20. ER_BACKUP_BACKUP
 # 21. ER_BACKUP_BACKUP_PREPARE
 # 22. ER_BACKUP_CANT_FIND_SE
@@ -252,12 +253,8 @@ LET $errname = ER_BACKUP_OPEN_WR;
 LET $operation = BACKUP;
 --source suite/backup/include/test_for_error.inc
 
-# Test for error ER_BACKUP_NOTHING_TO_BACKUP.
-LET $caseno = 19;
-LET $errno = $ER_BACKUP_NOTHING_TO_BACKUP;
-LET $errname = ER_BACKUP_NOTHING_TO_BACKUP;
-LET $operation = BACKUP;
---source suite/backup/include/test_for_error.inc
+--echo # dropped test for error ER_BACKUP_NOTHING_TO_BACKUP (19).
+--echo # leaving the gap in test case to avoid merge conflicts.
 
 # Test for error ER_BACKUP_BACKUP.
 LET $caseno = 20;

=== added file 'mysql-test/suite/backup/t/backup_missing_db.test'
--- a/mysql-test/suite/backup/t/backup_missing_db.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup/t/backup_missing_db.test	2010-01-22 09:51:39 +0000
@@ -0,0 +1,66 @@
+# Tests backup operations involving invalid database names
+
+--echo #
+--echo # Bug #36635 Backup: errors should be warnings
+--echo #
+
+--echo # Create Database and object view for this test.
+
+--disable_warnings
+DROP DATABASE IF EXISTS db1;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INTEGER);
+INSERT INTO t1 (i) VALUES (1), (2), (3), (4), (5);
+SELECT i FROM t1;
+
+
+--let $MYSQLD_BACKUPDIR= `select @@backupdir`;
+--error 0,1
+--remove_file $MYSQLD_BACKUPDIR/bmdb.bak;
+
+--enable_warnings
+
+--echo # Suppress warnings from backup
+call mtr.add_suppression("Backup: Unknown database");
+
+--echo # Start tests
+
+--echo # Case 1: Backing up an invalid database, should create
+--echo #         empty image with warning ER_BAD_DB_ERROR
+
+--replace_regex /[0-9]+/#/
+BACKUP DATABASE no_such_database TO 'bmdb.bak';
+
+--echo # restore from empty image
+replace_column 1 #;
+RESTORE FROM 'bmdb.bak' OVERWRITE;
+
+remove_file $MYSQLD_BACKUPDIR/bmdb.bak;
+
+--echo # Case 2: Backing up two databases, first being invalid
+
+--replace_regex /[0-9]+/#/
+BACKUP DATABASE no_such_database, db1 TO 'bmdb.bak';
+
+--echo # Restore the database
+--replace_regex /[0-9]+/#/
+RESTORE FROM 'bmdb.bak' OVERWRITE;
+SELECT i FROM t1;
+
+remove_file $MYSQLD_BACKUPDIR/bmdb.bak;
+
+--echo # Case 3: Backing up two databases, second being invalid
+--replace_regex /[0-9]+/#/
+BACKUP DATABASE db1, no_such_database  TO 'bmdb.bak';
+
+--echo # Restore the database
+replace_column 1 #;
+RESTORE FROM 'bmdb.bak' OVERWRITE;
+SELECT i FROM t1;
+
+remove_file $MYSQLD_BACKUPDIR/bmdb.bak;
+
+--echo # Cleanup
+
+DROP DATABASE db1;

=== modified file 'mysql-test/suite/backup/t/backup_pipe.test'
--- a/mysql-test/suite/backup/t/backup_pipe.test	2009-08-11 11:09:31 +0000
+++ b/mysql-test/suite/backup/t/backup_pipe.test	2010-01-22 09:51:39 +0000
@@ -84,8 +84,8 @@ connection con2;
 
 --echo con1:
 connection con1;
---replace_column 1 #
---error ER_BAD_DB_ERROR
+-- echo # replace all the numbers in output (backup id and warning number)
+--replace_regex /[0-9]+/#/
 reap;
 
 --echo Check that the pipe is still there and remove the file.

=== modified file 'mysql-test/suite/backup/t/backup_security.test'
--- a/mysql-test/suite/backup/t/backup_security.test	2009-12-01 01:49:23 +0000
+++ b/mysql-test/suite/backup/t/backup_security.test	2010-01-22 09:51:39 +0000
@@ -34,6 +34,9 @@ DROP DATABASE IF EXISTS backup_test;
 DROP DATABASE IF EXISTS backup_test_alt;
 --enable_warnings
 
+--echo # get backup directory path
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
+
 --echo #
 --echo # Use the basic data setup in backup_test database.
 --echo #
@@ -201,14 +204,13 @@ eval RESTORE FROM 'bup_user1.bak' OVERWR
 --echo #
 
 --echo #
---echo # conn_user1: Attempting backup. Should fail with 
---echo # error ER_BAD_DB_ERROR
+--echo # conn_user1: Attempting backup. Should succeed with 
+--echo # warning ER_BAD_DB_ERROR,
 --echo #
---replace_column 1 #
---error ER_BAD_DB_ERROR
+
+--replace_regex /[0-9]+/#/
 BACKUP DATABASE backup_test_alt to 'bup_no_priv.bak';
---replace_column 2 #
-SHOW ERRORS;
+remove_file $MYSQLD_BACKUPDIR/bup_no_priv.bak;
 
 --echo #
 --echo # conn_user1: Attempting backup. Should fail with 
@@ -239,7 +241,6 @@ DROP DATABASE backup_test;
 DROP DATABASE backup_test_alt;
 FLUSH PRIVILEGES;
 
-let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 remove_file $MYSQLD_BACKUPDIR/bup_root_user.bak;
 remove_file $MYSQLD_BACKUPDIR/backup_test_orig.bak;
 remove_file $MYSQLD_BACKUPDIR/bup_user1.bak;

=== modified file 'sql/backup/backup_info.cc'
--- a/sql/backup/backup_info.cc	2010-01-05 06:54:19 +0000
+++ b/sql/backup/backup_info.cc	2010-01-22 09:51:39 +0000
@@ -814,11 +814,6 @@ int Backup_info::add_dbs(THD *thd, List<
       delete obj;
       continue;
     }
-    else if (!unknown_dbs.is_empty()) // We just compose unknown_dbs list.
-    {
-      delete obj;
-      continue;
-    }
 
     // Normalize DB name; if case insensitive server, obj->get_db_name
     // returns name in lower case.
@@ -846,8 +841,8 @@ int Backup_info::add_dbs(THD *thd, List<
 
   if (!unknown_dbs.is_empty())
   {
-    m_log.report_error(ER_BAD_DB_ERROR, unknown_dbs.c_ptr());
-    goto error;
+    m_log.report_error(backup::log_level::WARNING,
+                ER_BAD_DB_ERROR, unknown_dbs.c_ptr());
   }
 
   return 0;

=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc	2010-01-05 06:54:19 +0000
+++ b/sql/backup/kernel.cc	2010-01-22 09:51:39 +0000
@@ -252,17 +252,6 @@ execute_backup_command(THD *thd,
     if (context.report_killed() || res || !info->is_valid())
       DBUG_RETURN(send_error(context, ER_BACKUP_BACKUP_PREPARE));
 
-    int count= info->db_count();
-
-    /* Error condition insertion for ER_BACKUP_NOTHING_TO_BACKUP. */
-    DBUG_EXECUTE_IF("ER_BACKUP_NOTHING_TO_BACKUP", count= 0;);
-
-    if (count == 0)
-    {
-      context.report_error(ER_BACKUP_NOTHING_TO_BACKUP);
-      DBUG_RETURN(send_error(context, ER_BACKUP_NOTHING_TO_BACKUP));
-    }
-
     /* Perform backup. */
 
     DEBUG_SYNC(thd, "before_do_backup");


Attachment: [text/bzr-bundle] bzr/anurag.shekhar@sun.com-20100122095139-ojg60sk7a0ykoapc.bundle
Thread
bzr commit into mysql-6.0-backup branch (anurag.shekhar:2936) Bug#36635Anurag Shekhar22 Jan