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, 2008-01-23 13:57:48-05:00, cbell@mysql_cab_desk. +4 -0
BUG#33562 : Backup: no warning about disabled storage engine
Added calls to save messages so that the SHOW ERRORS and
SHOW WARNINGS commands will present the errors and
warnings to the client properly.
mysql-test/r/backup_no_data.result@stripped, 2008-01-23 13:57:37-05:00, cbell@mysql_cab_desk. +2 -0
BUG#33562 : Backup: no warning about disabled storage engine
New result file
mysql-test/r/backup_no_engine.result@stripped, 2008-01-23 13:57:37-05:00, cbell@mysql_cab_desk. +2 -0
BUG#33562 : Backup: no warning about disabled storage engine
New result file
sql/backup/kernel.cc@stripped, 2008-01-23 13:57:38-05:00, cbell@mysql_cab_desk. +2 -0
BUG#33562 : Backup: no warning about disabled storage engine
Added call to reset messages when backup or restore starts.
sql/backup/logger.cc@stripped, 2008-01-23 13:57:39-05:00, cbell@mysql_cab_desk. +4 -0
BUG#33562 : Backup: no warning about disabled storage engine
Added calls to save messages so that the SHOW ERRORS and
SHOW WARNINGS commands will present the errors and
warnings to the client properly.
diff -Nrup a/mysql-test/r/backup_no_data.result b/mysql-test/r/backup_no_data.result
--- a/mysql-test/r/backup_no_data.result 2007-12-20 15:32:15 -05:00
+++ b/mysql-test/r/backup_no_data.result 2008-01-23 13:57:37 -05:00
@@ -64,6 +64,8 @@ CREATE VIEW v1 AS SELECT * FROM other_db
BACKUP DATABASE empty_db TO 'empty_db.bak';
backup_id
#
+Warnings:
+# 1618 Skipping view v1 in database empty_db
SHOW DATABASES;
Database
information_schema
diff -Nrup a/mysql-test/r/backup_no_engine.result b/mysql-test/r/backup_no_engine.result
--- a/mysql-test/r/backup_no_engine.result 2007-12-14 19:44:58 -05:00
+++ b/mysql-test/r/backup_no_engine.result 2008-01-23 13:57:37 -05:00
@@ -5,6 +5,8 @@ ENGINE=MYISAM;
BACKUP DATABASE db TO "db.backup";
backup_id
#
+Warnings:
+# 1619 Skipping table db.t2 since it has no valid storage engine
DROP DATABASE db;
CREATE DATABASE db;
RESTORE FROM "db.backup";
diff -Nrup a/sql/backup/kernel.cc b/sql/backup/kernel.cc
--- a/sql/backup/kernel.cc 2007-12-14 02:51:28 -05:00
+++ b/sql/backup/kernel.cc 2008-01-23 13:57:38 -05:00
@@ -90,6 +90,8 @@ execute_backup_command(THD *thd, LEX *le
using namespace backup;
+ mysql_reset_errors(thd, 0);
+
/*
Check access for SUPER rights. If user does not have SUPER, fail with error.
*/
diff -Nrup a/sql/backup/logger.cc b/sql/backup/logger.cc
--- a/sql/backup/logger.cc 2007-12-13 09:08:42 -05:00
+++ b/sql/backup/logger.cc 2008-01-23 13:57:39 -05:00
@@ -33,10 +33,14 @@ int Logger::write_message(log_level::val
errors.push_front(new MYSQL_ERROR(::current_thd,error_code,
MYSQL_ERROR::WARN_LEVEL_ERROR,msg));
sql_print_error(buf);
+ push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+ error_code, msg);
DBUG_PRINT("backup_log",("[ERROR] %s",buf));
return 0;
case log_level::WARNING:
+ push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+ error_code, msg);
sql_print_warning(buf);
DBUG_PRINT("backup_log",("[Warning] %s",buf));
return 0;
