summaryrefslogtreecommitdiff
path: root/sql/share/spanish
diff options
context:
space:
mode:
authorunknown <antony@ltantony.rdg.cyberkinetica.homeunix.net>2003-12-02 20:57:34 +0000
committerunknown <antony@ltantony.rdg.cyberkinetica.homeunix.net>2003-12-02 20:57:34 +0000
commit4d445feb1a13a2bcf957d9cf0df0b37d8270f455 (patch)
tree28430fb68ab7df9013fbdd16332a80afc913c5aa /sql/share/spanish
parent5a8f0009479a90b81c2c9779a1b637fb6df7dd08 (diff)
parentf4a0e903d18a742275c308e1894157e9d9b14ea6 (diff)
downloadmariadb-git-4d445feb1a13a2bcf957d9cf0df0b37d8270f455.tar.gz
Merge for update
mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_yacc.yy: Auto merged include/mysqld_error.h: Merge for updates mysql-test/r/rpl_change_master.result: Merge for updates sql/share/czech/errmsg.txt: Merge for updates sql/share/danish/errmsg.txt: Merge for updates sql/share/dutch/errmsg.txt: Merge for updates sql/share/english/errmsg.txt: Merge for updates sql/share/estonian/errmsg.txt: Merge for updates sql/share/french/errmsg.txt: Merge for updates sql/share/german/errmsg.txt: Merge for updates sql/share/greek/errmsg.txt: Merge for updates sql/share/hungarian/errmsg.txt: Merge for updates sql/share/italian/errmsg.txt: Merge for updates sql/share/japanese/errmsg.txt: Merge for updates sql/share/korean/errmsg.txt: Merge for updates sql/share/norwegian-ny/errmsg.txt: Merge for updates sql/share/norwegian/errmsg.txt: Merge for updates sql/share/polish/errmsg.txt: Merge for updates sql/share/portuguese/errmsg.txt: Merge for updates sql/share/romanian/errmsg.txt: Merge for updates sql/share/russian/errmsg.txt: Merge for updates sql/share/serbian/errmsg.txt: Merge for updates sql/share/slovak/errmsg.txt: Merge for updates sql/share/spanish/errmsg.txt: Merge for updates sql/share/swedish/errmsg.txt: Merge for updates sql/share/ukrainian/errmsg.txt: Merge for updates
Diffstat (limited to 'sql/share/spanish')
-rw-r--r--sql/share/spanish/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index dec8735801f..0db613ae4c7 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -290,3 +290,4 @@ character-set=latin1
"Column '%-.64s' cannot be part of FULLTEXT index",
"Unknown key cache '%-.100s'",
"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
+"Unknown table engine '%s'",