Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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, 2007-04-19 18:58:32+02:00, df@stripped +1 -0
BUG#27818 comedy of errors
sql/share/errmsg.txt@stripped, 2007-04-19 18:58:29+02:00, df@stripped +2 -2
BUG#27818 upgrading from 5.1.16 to 5.1.17 gives wrong error message about fixing internal tables; as of 5.1.10, it is recommended to use mysql_upgrade.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: df
# Host: pippilotta.erinye.com
# Root: /shared/home/df/mysql/build/mysql-5.1-build-work-27818
--- 1.154/sql/share/errmsg.txt 2007-04-07 11:55:25 +02:00
+++ 1.155/sql/share/errmsg.txt 2007-04-19 18:58:29 +02:00
@@ -5914,8 +5914,8 @@
eng "Upholding foreign key constraints for table '%.192s', entry '%-.192s', key %d would lead to a duplicate entry"
ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
- eng "Column count of mysql.%s is wrong. Expected %d, found %d. Created with MySQL %d, now running %d. Please use scripts/mysql_fix_privilege_tables"
- ger "Spaltenanzahl von mysql.%s falsch. %d erwartet, aber %d erhalten. Erzeugt mit MySQL %d, jetzt unter %d. Bitte benutzen Sie scripts/mysql_fix_privilege_tables, um den Fehler zu beheben"
+ eng "Column count of mysql.%s is wrong. Expected %d, found %d. Created with MySQL %d, now running %d. Please use mysql_upgrade to fix this error."
+ ger "Spaltenanzahl von mysql.%s falsch. %d erwartet, aber %d erhalten. Erzeugt mit MySQL %d, jetzt unter %d. Bitte benutzen Sie mysql_upgrade, um den Fehler zu beheben"
ER_REMOVED_SPACES
eng "Leading spaces are removed from name '%s'"
| Thread |
|---|
| • bk commit into 5.1 tree (df:1.2596) BUG#27818 | Daniel Fischer | 19 Apr |
