diff options
| author | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
| commit | 4cc04190304fed0f9e7378dfd92d645690631836 (patch) | |
| tree | a07a30ca097bfae53819a79e123ec4c4dd7d751b /include/sql_state.h | |
| parent | 7c3be1ba3900042ba97f966858b54589edfc9800 (diff) | |
| parent | 07de836b44434cbab033d02cc47879275080f65c (diff) | |
| download | mariadb-git-4cc04190304fed0f9e7378dfd92d645690631836.tar.gz | |
Merged 4.1 -> 5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'include/sql_state.h')
| -rw-r--r-- | include/sql_state.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sql_state.h b/include/sql_state.h index d206c659b60..de8df2d88a5 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -161,6 +161,7 @@ ER_WARN_DATA_OUT_OF_RANGE, "01000", "", ER_WARN_DATA_TRUNCATED, "01000", "", ER_WRONG_NAME_FOR_INDEX, "42000", "", ER_WRONG_NAME_FOR_CATALOG, "42000", "", +ER_UNKNOWN_TABLE_ENGINE, "42000", "", /* 5.0 */ ER_SP_NO_RECURSIVE_CREATE, "2F003", "", ER_SP_ALREADY_EXISTS, "42000", "", |