2855 Chuck Bell 2009-08-06 [merge]
Local merge prior to push BUG#46541.
modified:
.bzr-mysql/default.conf
mysql-test/suite/backup/r/backup_logs.result
mysql-test/suite/backup/t/backup_logs.test
sql/set_var.cc
=== modified file 'mysql-test/r/backup_disabled.result'
--- a/mysql-test/r/backup_disabled.result 2009-05-16 23:42:25 +0000
+++ b/mysql-test/r/backup_disabled.result 2009-08-05 15:13:12 +0000
@@ -7,12 +7,12 @@ CREATE DATABASE db1;
# Attempt to run a backup.
#
BACKUP DATABASE db1 to 'bup_db1.bak';
-ERROR HY000: The MySQL Backup system is disabled in this release. Use --new on server startup to enable.
+ERROR HY000: The MySQL Backup system is disabled in this release. Use --mysql-backup or --mysql-backup=1 on server startup to enable.
#
# Attempt to run a restore
#
RESTORE FROM 'bup_db1.bak';
-ERROR HY000: The MySQL Backup system is disabled in this release. Use --new on server startup to enable.
+ERROR HY000: The MySQL Backup system is disabled in this release. Use --mysql-backup or --mysql-backup=1 on server startup to enable.
#
# Cleanup
#
=== modified file 'mysql-test/suite/backup/my.cnf'
--- a/mysql-test/suite/backup/my.cnf 2009-07-08 07:30:40 +0000
+++ b/mysql-test/suite/backup/my.cnf 2009-08-05 15:13:12 +0000
@@ -4,10 +4,10 @@
[mysqld.1]
log-bin= master-bin
-new= 1
+mysql-backup= 1
[mysqld.2]
-new= 1
+mysql-backup= 1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/backup_engines/my.cnf'
--- a/mysql-test/suite/backup_engines/my.cnf 2009-07-08 07:30:40 +0000
+++ b/mysql-test/suite/backup_engines/my.cnf 2009-08-05 15:13:12 +0000
@@ -4,10 +4,10 @@
[mysqld.1]
log-bin= master-bin
-new= 1
+mysql-backup= 1
[mysqld.2]
-new= 1
+mysql-backup= 1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/backup_extra/my.cnf'
--- a/mysql-test/suite/backup_extra/my.cnf 2009-07-08 07:30:40 +0000
+++ b/mysql-test/suite/backup_extra/my.cnf 2009-08-05 15:13:12 +0000
@@ -4,10 +4,10 @@
[mysqld.1]
log-bin= master-bin
-new= 1
+mysql-backup= 1
[mysqld.2]
-new= 1
+mysql-backup= 1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/backup_ptr/my.cnf'
--- a/mysql-test/suite/backup_ptr/my.cnf 2009-07-08 07:30:40 +0000
+++ b/mysql-test/suite/backup_ptr/my.cnf 2009-08-05 15:13:12 +0000
@@ -4,10 +4,10 @@
[mysqld.1]
log-bin= master-bin
-new= 1
+mysql-backup= 1
[mysqld.2]
-new= 1
+mysql-backup= 1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/ndb/t/backup_no_ndb.cnf'
--- a/mysql-test/suite/ndb/t/backup_no_ndb.cnf 2009-06-03 20:29:31 +0000
+++ b/mysql-test/suite/ndb/t/backup_no_ndb.cnf 2009-08-05 15:13:12 +0000
@@ -2,11 +2,11 @@
[mysqld.1]
server_id=1
-new=1
+mysql-backup=1
[mysqld.2]
server_id=2
-new=1
+mysql-backup=1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/rpl/t/rpl_backup.cnf'
--- a/mysql-test/suite/rpl/t/rpl_backup.cnf 2009-05-16 23:42:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup.cnf 2009-08-05 15:13:12 +0000
@@ -2,11 +2,11 @@
[mysqld.1]
server_id=1
-new=1
+mysql-backup=1
[mysqld.2]
server_id=2
-new=1
+mysql-backup=1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_block.cnf'
--- a/mysql-test/suite/rpl/t/rpl_backup_block.cnf 2009-05-16 23:42:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_block.cnf 2009-08-05 15:13:12 +0000
@@ -2,15 +2,15 @@
[mysqld.1]
server_id=1
-new=1
+mysql-backup=1
[mysqld.2]
server_id=2
-new=1
+mysql-backup=1
[mysqld.3]
server_id=3
-new=1
+mysql-backup=1
[ENV]
SLAVE_MYPORT2= @mysqld.3.port
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_extra.cnf'
--- a/mysql-test/suite/rpl/t/rpl_backup_extra.cnf 2009-05-16 23:42:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_extra.cnf 2009-08-05 15:13:12 +0000
@@ -2,11 +2,11 @@
[mysqld.1]
server_id=1
-new=1
+mysql-backup=1
[mysqld.2]
server_id=2
-new=1
+mysql-backup=1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_multi.cnf'
--- a/mysql-test/suite/rpl/t/rpl_backup_multi.cnf 2009-05-16 23:42:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_multi.cnf 2009-08-05 15:13:12 +0000
@@ -3,22 +3,22 @@
[mysqld.1]
log-slave-updates
innodb
-new=1
+mysql-backup=1
[mysqld.2]
log-slave-updates
innodb
-new=1
+mysql-backup=1
[mysqld.3]
log-slave-updates
innodb
-new=1
+mysql-backup=1
[mysqld.4]
log-slave-updates
innodb
-new=1
+mysql-backup=1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_ptr.cnf'
--- a/mysql-test/suite/rpl/t/rpl_backup_ptr.cnf 2009-05-16 23:42:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_ptr.cnf 2009-08-05 15:13:12 +0000
@@ -2,11 +2,11 @@
[mysqld.1]
server_id=1
-new=1
+mysql-backup=1
[mysqld.2]
server_id=2
-new=1
+mysql-backup=1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_shutdown.cnf'
--- a/mysql-test/suite/rpl/t/rpl_backup_shutdown.cnf 2009-05-16 23:42:25 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_shutdown.cnf 2009-08-05 15:13:12 +0000
@@ -2,11 +2,11 @@
[mysqld.1]
server_id=1
-new=1
+mysql-backup=1
[mysqld.2]
server_id=2
-new=1
+mysql-backup=1
[ENV]
MASTER_MYPORT= @mysqld.1.port
=== modified file 'mysql-test/t/backup_disabled.test'
--- a/mysql-test/t/backup_disabled.test 2009-05-16 23:42:25 +0000
+++ b/mysql-test/t/backup_disabled.test 2009-08-05 15:13:12 +0000
@@ -3,7 +3,7 @@
# server by default.
#
# Note: All backup tests and suites will run as normal using the
-# --new server startup option
+# --mysql-backup server startup option
#
--source include/not_embedded.inc
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h 2009-07-07 11:33:10 +0000
+++ b/sql/mysql_priv.h 2009-08-05 15:13:12 +0000
@@ -1960,6 +1960,7 @@ extern bool opt_update_log, opt_bin_log,
extern my_bool opt_log, opt_slow_log;
extern my_bool opt_backup_history_log;
extern my_bool opt_backup_progress_log;
+extern my_bool opt_mysql_backup;
extern ulong log_output_options;
extern ulong log_backup_output_options;
extern my_bool opt_log_queries_not_using_indexes;
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2009-07-21 08:37:50 +0000
+++ b/sql/mysqld.cc 2009-08-05 15:13:12 +0000
@@ -452,6 +452,7 @@ bool opt_update_log, opt_bin_log, opt_ig
my_bool opt_log, opt_slow_log;
my_bool opt_backup_history_log;
my_bool opt_backup_progress_log;
+my_bool opt_mysql_backup;
ulong log_output_options;
ulong log_backup_output_options;
my_bool opt_log_queries_not_using_indexes= 0;
@@ -5923,6 +5924,7 @@ enum options_mysqld
OPT_SYNC_MASTER_INFO,
OPT_BACKUP_HISTORY_LOG_FILE,
OPT_BACKUP_PROGRESS_LOG_FILE,
+ OPT_MYSQL_BACKUP,
OPT_IGNORE_BUILTIN_INNODB
};
@@ -5971,6 +5973,9 @@ struct my_option my_long_options[] =
{"backup-progress-log", OPT_BACKUP_PROGRESS_LOG,
"Enable|disable backup progress log", (uchar**) &opt_backup_progress_log,
(uchar**) &opt_backup_progress_log, 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},
+ {"mysql-backup", OPT_MYSQL_BACKUP,
+ "Enable|disable MySQL Backup system", (uchar**) &opt_mysql_backup,
+ (uchar**) &opt_mysql_backup, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"basedir", 'b',
"Path to installation directory. All paths are usually resolved relative to this.",
(uchar**) &mysql_home_ptr, (uchar**) &mysql_home_ptr, 0, GET_STR, REQUIRED_ARG,
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt 2009-07-15 19:19:14 +0000
+++ b/sql/share/errmsg-utf8.txt 2009-08-05 15:13:12 +0000
@@ -6539,7 +6539,7 @@ ER_PATH_LENGTH
ER_BACKUP_INTERRUPTED
eng "Operation has been interrupted."
ER_BACKUP_NOT_ENABLED
- eng "The MySQL Backup system is disabled in this release. Use --new on server startup to enable."
+ eng "The MySQL Backup system is disabled in this release. Use --mysql-backup or --mysql-backup=1 on server startup to enable."
WARN_DB_DROP_RENAMED
eng "Renamed directory with unknown files to '%.200s'"
ER_BACKUP_NO_NDB
=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt 2009-07-15 19:19:14 +0000
+++ b/sql/share/errmsg.txt 2009-08-05 15:13:12 +0000
@@ -6539,7 +6539,7 @@ ER_PATH_LENGTH
ER_BACKUP_INTERRUPTED
eng "Operation has been interrupted."
ER_BACKUP_NOT_ENABLED
- eng "The MySQL Backup system is disabled in this release. Use --new on server startup to enable."
+ eng "The MySQL Backup system is disabled in this release. Use --mysql-backup or --mysql-backup=1 on server startup to enable."
WARN_DB_DROP_RENAMED
eng "Renamed directory with unknown files to '%.200s'"
ER_BACKUP_NO_NDB
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc 2009-07-28 05:40:46 +0000
+++ b/sql/sql_parse.cc 2009-08-05 15:13:12 +0000
@@ -2332,7 +2332,7 @@ mysql_execute_command(THD *thd)
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "BACKUP");
goto error;
#else
- if (global_system_variables.new_mode)
+ if (opt_mysql_backup)
{
/*
Note: execute_backup_test_command() sends a correct response to the client
@@ -2361,7 +2361,7 @@ mysql_execute_command(THD *thd)
goto error;
#else
{
- if (global_system_variables.new_mode)
+ if (opt_mysql_backup)
{
/*
Stack the 'backup_in_progress' variable. If this is run inside
Attachment: [text/bzr-bundle] bzr/charles.bell@sun.com-20090806175703-9eeam5cdlnbg3a3p.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-backup branch (charles.bell:2855) Bug#46541 | Chuck Bell | 6 Aug |
