Rafal,
One question about this patch.
> -----Original Message-----
> From: rsomla@stripped [mailto:rsomla@stripped]
> Sent: Wednesday, March 05, 2008 12:48 PM
> To: commits@stripped
> Subject: bk commit into 6.0 tree (rafal:1.2577) WL#4212
>
...
> diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
> --- a/sql/mysqld.cc 2008-03-04 18:08:22 +01:00
> +++ b/sql/mysqld.cc 2008-03-05 18:48:04 +01:00
> @@ -3133,7 +3133,6 @@ SHOW_VAR com_status_vars[]= {
> {"savepoint", (char*) offsetof(STATUS_VAR,
> com_stat[(uint) SQLCOM_SAVEPOINT]), SHOW_LONG_STATUS},
> {"select", (char*) offsetof(STATUS_VAR,
> com_stat[(uint) SQLCOM_SELECT]), SHOW_LONG_STATUS},
> {"set_option", (char*) offsetof(STATUS_VAR,
> com_stat[(uint) SQLCOM_SET_OPTION]), SHOW_LONG_STATUS},
> - {"show_archive", (char*) offsetof(STATUS_VAR,
> com_stat[(uint) SQLCOM_SHOW_ARCHIVE]), SHOW_LONG_STATUS},
> {"show_authors", (char*) offsetof(STATUS_VAR,
> com_stat[(uint) SQLCOM_SHOW_AUTHORS]), SHOW_LONG_STATUS},
> {"show_binlog_events", (char*) offsetof(STATUS_VAR,
> com_stat[(uint) SQLCOM_SHOW_BINLOG_EVENTS]), SHOW_LONG_STATUS},
> {"show_binlogs", (char*) offsetof(STATUS_VAR,
> com_stat[(uint) SQLCOM_SHOW_BINLOGS]), SHOW_LONG_STATUS},
> diff -Nrup a/sql/share/errmsg.txt b/sql/share/errmsg.txt
> --- a/sql/share/errmsg.txt 2008-03-04 18:08:22 +01:00
> +++ b/sql/share/errmsg.txt 2008-03-05 18:48:05 +01:00
> @@ -6258,11 +6258,27 @@ ER_BACKUP_WRONG_TABLE_BE
> ER_BACKUP_CANT_RESTORE_DB
> eng "Could not restore database %-.64s"
> ER_BACKUP_CANT_RESTORE_TABLE
> - eng "Could not restore database %-.64s"
> + eng "Could not restore table %-.64s"
> +ER_BACKUP_CANT_RESTORE_VIEW
> + eng "Could not restore view %-.64s"
> +ER_BACKUP_CANT_RESTORE_SROUT
> + eng "Could not restore stored routine %-.64s"
> +ER_BACKUP_CANT_RESTORE_EVENT
> + eng "Could not restore event %-.64s"
> +ER_BACKUP_CANT_RESTORE_TRIGGER
> + eng "Could not restore trigger %-.64s"
> ER_BACKUP_CATALOG_ADD_DB
> eng "Failed to add database %-.64s to the catalog"
> ER_BACKUP_CATALOG_ADD_TABLE
> eng "Failed to add table %-.64s to the catalog"
> +ER_BACKUP_CATALOG_ADD_VIEW
> + eng "Failed to add view `%-.64s`.`%-.64s` to the catalog"
> +ER_BACKUP_CATALOG_ADD_SROUT
> + eng "Failed to add stored routine `%-.64s`.`%-.64s` to
> the catalog"
> +ER_BACKUP_CATALOG_ADD_EVENT
> + eng "Failed to add event `%-.64s`.`%-.64s` to the catalog"
> +ER_BACKUP_CATALOG_ADD_TRIGGER
> + eng "Failed to add trigger `%-.64s`.`%-.64s` to the catalog"
> ER_BACKUP_UNKNOWN_OBJECT
> eng "Backup image refers to an object which could not
> be found in the catalog"
> ER_BACKUP_UNKNOWN_OBJECT_TYPE
> @@ -6291,5 +6307,23 @@ ER_BACKUP_GET_META_DB
> eng "Failed to obtain meta-data for database %-.64s"
> ER_BACKUP_GET_META_TABLE
> eng "Failed to obtain meta-data for table %-.64s"
> +ER_BACKUP_GET_META_VIEW
> + eng "Failed to obtain meta-data for view %-.64s"
> +ER_BACKUP_GET_META_SROUT
> + eng "Failed to obtain meta-data for stored routine %-.64s"
> +ER_BACKUP_GET_META_EVENT
> + eng "Failed to obtain meta-data for event %-.64s"
> +ER_BACKUP_GET_META_TRIGGER
> + eng "Failed to obtain meta-data for trigger %-.64s"
> ER_BACKUP_CREATE_BE
> eng "Cannot create backup engine for storage engine %-.64s"
> +ER_BACKUP_LIST_PERDB
> + eng "Can't enumerate per database objects"
> +ER_BACKUP_LIST_DB_VIEWS
> + eng "Can't enumerate views in database `%-.64s`"
> +ER_BACKUP_LIST_DB_SROUT
> + eng "Can't enumerate stored routines in database `%-.64s`"
> +ER_BACKUP_LIST_DB_EVENTS
> + eng "Can't enumerate events in database `%-.64s`"
> +ER_BACKUP_LIST_DB_TRIGGERS
> + eng "Can't enumerate triggers in database `%-.64s`"
Changing existing error messages has been known to cause cascading errors
for other, seemingly unrelated tests (it has a logical explanation as I am
sure you know). I ran a partial test set (didn't do all rpl or ndb and
couldn't do backup) and found no tests that failed due to error number
changes (but over 20 failed due to other unrelated problems). Please run a
full test to make sure we're ok and include patches to fix any test failures
found.
Chuck
