diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-09-29 15:10:20 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-09-29 15:10:20 +0200 |
| commit | b38d99828b55a1792a62902a428356397ce4c199 (patch) | |
| tree | 6df705b541ad1159b96dfdf997e379d7790d3ff3 /sql/share | |
| parent | 08f6fca42d55051ff9a96dec9ba691895e02e40e (diff) | |
| download | mariadb-git-b38d99828b55a1792a62902a428356397ce4c199.tar.gz | |
merge fixes
mysql-test/t/view.test:
moved the new error message last
sql/share/errmsg.txt:
moved the new error message last
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 51b91ece468..4cd11f9080c 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5986,10 +5986,10 @@ ER_HOSTNAME eng "host name" ER_WRONG_STRING_LENGTH eng "String '%-.70s' is too long for %s (should be no longer than %d)" -ER_NON_INSERTABLE_TABLE - eng "The target table %-.100s of the %s is not insertable-into" ER_UNSUPORTED_LOG_ENGINE eng "This storage engine cannot be used for log tables"" ER_BAD_LOG_STATEMENT eng "You cannot '%s' a log table if logging is enabled" +ER_NON_INSERTABLE_TABLE + eng "The target table %-.100s of the %s is not insertable-into" |