bzr commit into mysql-6.0-backup branch (charles.bell:2855) Bug#46541

[Chuck Bell]

#At file:///D:/source/bzr/mysql-6.0-bug-46541/ based on
revid:charles.bell@stripped

 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 '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-07-21 14:57:51 +0000
+++ b/.bzr-mysql/default.conf	2009-08-06 17:13:33 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = "bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-azalea"
+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-5.4"
+tree_name = "mysql-6.0-backup"

=== modified file 'mysql-test/suite/backup/r/backup_logs.result'
--- a/mysql-test/suite/backup/r/backup_logs.result	2009-07-28 06:25:23 +0000
+++ b/mysql-test/suite/backup/r/backup_logs.result	2009-08-04 20:12:18 +0000
@@ -371,6 +371,10 @@ Attempt to set the backup log paths to a
 
 SET global max_allowed_packet=1024*100;
 
+Now attempt to set the backup_progress_log_file to 127 characters.
+
+SET @@global.backup_progress_log_file = repeat('a',127);
+
 Now attempt to set the backup_progress_log_file to 255 characters.
 
 SET @@global.backup_progress_log_file = repeat('a',255);
@@ -386,7 +390,11 @@ SET @@global.backup_progress_log_file = 
 ERROR HY000: The path specified for backup_progress_log_file is too long.
 SET @@global.backup_progress_log_file = DEFAULT;
 
-Now attempt to set the backup_history_log_file to 255 characters.
+Now attempt to set the backup_history_log_file to 127 characters.
+
+SET @@global.backup_history_log_file = repeat('a',127);
+
+Now attempt to set the backup_progress_log_file to 255 characters.
 
 SET @@global.backup_history_log_file = repeat('a',255);
 

=== modified file 'mysql-test/suite/backup/t/backup_logs.test'
--- a/mysql-test/suite/backup/t/backup_logs.test	2009-07-28 06:25:23 +0000
+++ b/mysql-test/suite/backup/t/backup_logs.test	2009-08-04 20:12:18 +0000
@@ -511,8 +511,18 @@ BACKUP DATABASE backup_logs to 'backup_l
 SET global max_allowed_packet=1024*100;
 
 --echo
+--echo Now attempt to set the backup_progress_log_file to 127 characters.
+--echo
+SET @@global.backup_progress_log_file = repeat('a',127);
+
+--echo
 --echo Now attempt to set the backup_progress_log_file to 255 characters.
 --echo
+#
+# Errors can occur on platforms with shorter filename (like Cygwin
+# on Windows).
+#
+--error 0,29
 SET @@global.backup_progress_log_file = repeat('a',255);
 
 --echo
@@ -529,8 +539,18 @@ SET @@global.backup_progress_log_file = 
 SET @@global.backup_progress_log_file = DEFAULT;
 
 --echo
---echo Now attempt to set the backup_history_log_file to 255 characters.
+--echo Now attempt to set the backup_history_log_file to 127 characters.
 --echo
+SET @@global.backup_history_log_file = repeat('a',127);
+
+--echo
+--echo Now attempt to set the backup_progress_log_file to 255 characters.
+--echo
+#
+# Errors can occur on platforms with shorter filename (like Cygwin
+# on Windows).
+#
+--error 0,29
 SET @@global.backup_history_log_file = repeat('a',255);
 
 --echo

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2009-07-10 12:31:32 +0000
+++ b/sql/set_var.cc	2009-08-04 20:12:18 +0000
@@ -2795,10 +2795,10 @@ bool update_sys_var_str_path(THD *thd, s
       Open the backup logs if specified.
     */
     case BACKUP_HISTORY_LOG:
-      backup_log->open_backup_history_log(res);
+      result= backup_log->open_backup_history_log(res);
       break;
     case BACKUP_PROGRESS_LOG:
-      backup_log->open_backup_progress_log(res);
+      result= backup_log->open_backup_progress_log(res);
       break;
     default:
       DBUG_ASSERT(0);


Attachment: [text/bzr-bundle] bzr/[e-mail]