diff options
| author | unknown <petr/cps@owlet.local> | 2006-09-15 17:24:13 +0400 |
|---|---|---|
| committer | unknown <petr/cps@owlet.local> | 2006-09-15 17:24:13 +0400 |
| commit | 372d1c8c5a82ade48a98ca9c724241ef348eff7b (patch) | |
| tree | 941901b73008934003e348da1eb5233732e53c0b /sql/share | |
| parent | bba4e89a514b7d61ef04ce012514538ee59dff35 (diff) | |
| parent | abbb201661144f2a75d70c32da49dcb1692be412 (diff) | |
| download | mariadb-git-372d1c8c5a82ade48a98ca9c724241ef348eff7b.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/home/cps/mysql/trees/5.1-runtime-new
sql/handler.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_table.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 37f54899615..2b382317253 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5990,3 +5990,7 @@ ER_HOSTNAME eng "host name" ER_WRONG_STRING_LENGTH eng "String '%-.70s' is too long for %s (should be no longer than %d)" +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" |