diff options
| author | unknown <dlenev@mockturtle.local> | 2006-09-14 23:53:35 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-09-14 23:53:35 +0400 |
| commit | f1e6d23944e48d8293d38acaccb91a423b1e6ac8 (patch) | |
| tree | a407ae8ad0f336c756ce35ff39da6ccfac735913 /sql/share | |
| parent | 6a490444a615b9fd8ee057f71c215175cd6eb4cc (diff) | |
| parent | 2d8bd8767527864e4b9b2328e3d9b8d4bf676e4a (diff) | |
| download | mariadb-git-f1e6d23944e48d8293d38acaccb91a423b1e6ac8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
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 28d81447c66..37f54899615 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5978,6 +5978,10 @@ ER_BAD_LOG_ENGINE eng "One can use only CSV and MyISAM engines for the log tables" ER_CANT_DROP_LOG_TABLE eng "Cannot drop log table if log is enabled" +ER_EVENT_RECURSIVITY_FORBIDDEN + eng "Recursivity of EVENT DDL statements is forbidden when body is present" +ER_EVENTS_DB_ERROR + eng "Cannot proceed because the tables used by events were found damaged at server start" ER_ONLY_INTEGERS_ALLOWED eng "Only normal integers allowed as number here" ER_USERNAME |