List:Commits« Previous MessageNext Message »
From:Chuck Bell Date:January 29 2010 6:41pm
Subject:bzr commit into mysql-backup-backport branch (charles.bell:3077)
Bug#34065
View as plain text  
#At file:///home/cbell/source/bzr/MS10/ based on revid:charles.bell@stripped

 3077 Chuck Bell	2010-01-29
      Fixing regression caused by patch for bug#34065
      
      original changeset: 2942 (mysql-6.0-backup)

    modified:
      mysql-test/suite/backup/r/backup_misc.result
      mysql-test/suite/backup/t/backup_misc.test
      scripts/mysql_system_tables_fix.sql
=== modified file 'mysql-test/suite/backup/r/backup_misc.result'
--- a/mysql-test/suite/backup/r/backup_misc.result	2010-01-29 18:40:23 +0000
+++ b/mysql-test/suite/backup/r/backup_misc.result	2010-01-29 18:41:27 +0000
@@ -20,6 +20,7 @@ SELECT length('X123456789012345678901234
 length
 256
 # Try backing up in a file with length more than 255
+# Mask the file path
 BACKUP DATABASE test TO 'X123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012341';
-ERROR HY000: Can't create/write to file '/home/anurag/mysqlsrc/mysql-6.0-backup/mysql-test/var/mysqld.1/data/X123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012341' (Errcode: 36)
+ERROR HY000: Can't create/write to # (Errcode: 36)
 # Cleanup

=== modified file 'mysql-test/suite/backup/t/backup_misc.test'
--- a/mysql-test/suite/backup/t/backup_misc.test	2010-01-29 18:40:23 +0000
+++ b/mysql-test/suite/backup/t/backup_misc.test	2010-01-29 18:41:27 +0000
@@ -30,6 +30,8 @@ SELECT length(backup_file) from mysql.ba
 eval SELECT length('$INVALID_FILE_NAME') AS length;
 
 --echo # Try backing up in a file with length more than 255
+--echo # Mask the file path
+--replace_regex /file \'.*\'/#/
 --error 1
 eval BACKUP DATABASE test TO '$INVALID_FILE_NAME';
 

=== modified file 'scripts/mysql_system_tables_fix.sql'
--- a/scripts/mysql_system_tables_fix.sql	2010-01-29 18:40:23 +0000
+++ b/scripts/mysql_system_tables_fix.sql	2010-01-29 18:41:27 +0000
@@ -608,7 +608,7 @@ flush privileges;
 ALTER TABLE backup_history ADD COLUMN backup_file_path VARCHAR (512) NOT NULL DEFAULT '' COMMENT 'The full path to the backup image file' AFTER backup_file;
 ALTER TABLE backup_history CHANGE COLUMN binlog_pos binlog_start_pos INT UNSIGNED  NOT NULL DEFAULT 0 COMMENT 'The recorded binlog start position of backup/restore';
 # Increase the width of backup_file column
-ALTER TABLE backup_history MODIFY COLUMN backup_file CHAR (255) NOT NULL;
+ALTER TABLE backup_history MODIFY COLUMN backup_file CHAR (255) NOT NULL DEFAULT '' COMMENT 'The name of the file';
 
 
 #


Attachment: [text/bzr-bundle] bzr/charles.bell@sun.com-20100129184127-qyvtrkieq6ix89k4.bundle
Thread
bzr commit into mysql-backup-backport branch (charles.bell:3077)Bug#34065Chuck Bell29 Jan