bzr commit into mysql-6.0-backup branch (jorgen.loland:2702) Bug#36854

[Jorgen Loland]

#At file:///localhome/jl208045/mysql/mysql-6.0-backup-36854/

 2702 Jorgen Loland	2008-10-08
      Bug#36854 - Backup: error message truncated.
      
      Patch changes the text of the very long error message for ER_BACKUP_TS_CHANGE
modified:
  mysql-test/suite/backup/r/backup_tablespace.result
  sql/backup/kernel.cc
  sql/share/errmsg.txt

per-file comments:
  mysql-test/suite/backup/r/backup_tablespace.result
    New test result file due to changed error message for ER_BACKUP_TS_CHANGE
  sql/backup/kernel.cc
    Error message ER_BACKUP_TS_CHANGE now takes only one parameter - tablespace name
  sql/share/errmsg.txt
    Changed error message text for ER_BACKUP_TS_CHANGE
=== modified file 'mysql-test/suite/backup/r/backup_tablespace.result'
--- a/mysql-test/suite/backup/r/backup_tablespace.result	2008-10-07 17:15:44 +0000
+++ b/mysql-test/suite/backup/r/backup_tablespace.result	2008-10-08 11:38:07 +0000
@@ -50,7 +50,7 @@ DROP TABLESPACE bup_ts ENGINE=FALCON;
 CREATE TABLESPACE bup_ts ADD DATAFILE 'different.dat' ENGINE=FALCON;
 Now restore the database.
 RESTORE FROM 'backup_ts.bak';
-ERROR HY000: Tablespace `bup_ts` needed by tables being restored has changed on the server. The original definition of the required tablespace is 'CREATE TABLESPACE `bup_ts` ADD DATAFILE 'bup_ts.dat' COMMENT = 'test tablespace backup' ENGINE=Falcon' while the same tablespace is defined o
+ERROR HY000: Tablespace `bup_ts` needed by tables being restored, but the current tablespace definition differs from how it was when backup was made.
 Cleanup
 DROP DATABASE IF EXISTS backup_ts;
 DROP TABLESPACE bup_ts ENGINE=FALCON;

=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc	2008-09-30 07:51:48 +0000
+++ b/sql/backup/kernel.cc	2008-10-08 11:38:07 +0000
@@ -1823,9 +1823,7 @@ int bcat_create_item(st_bstream_image_he
     if (ts)
     {
       DBUG_PRINT("restore",(" tablespace has changed on the server - aborting"));
-      info->m_ctx.fatal_error(ER_BACKUP_TS_CHANGE, desc,
-                              obs::describe_tablespace(sobj)->ptr(),
-                              obs::describe_tablespace(ts)->ptr());
+      info->m_ctx.fatal_error(ER_BACKUP_TS_CHANGE, desc);
       return BSTREAM_ERROR;
     }
   }

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2008-09-29 18:41:59 +0000
+++ b/sql/share/errmsg.txt	2008-10-08 11:38:07 +0000
@@ -6353,7 +6353,7 @@ ER_BACKUP_CAT_ENUM
 ER_BACKUP_CANT_RESTORE_TS
         eng "Could not create tablespace %-.64s needed by tables being restored."
 ER_BACKUP_TS_CHANGE
-        eng "Tablespace %-.64s needed by tables being restored has changed on the server. The original definition of the required tablespace is '%-.256s' while the same tablespace is defined on the server as '%-.256s'"
+        eng "Tablespace %-.64s needed by tables being restored, but the current tablespace definition differs from how it was when backup was made."
 ER_BACKUP_GET_META_TS
         eng "Failed to obtain meta-data for tablespace %-.64s."
 ER_TABLESPACE_DATAFILE_EXIST