diff options
| author | unknown <guilhem@mysql.com> | 2006-02-25 22:22:12 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2006-02-25 22:22:12 +0100 |
| commit | 9cd6325b63975391e9016cd89125e01642af7c42 (patch) | |
| tree | 82c0cff48d5ce0d0c10d4fd0e6dd73f513bf8cba /sql/share | |
| parent | 8f4cec206ba6ec44f1e1e84f4b0842f585039ace (diff) | |
| parent | 7cac0ddfd01a6cdb4a8779fe1fb2edf10c1dc751 (diff) | |
| download | mariadb-git-9cd6325b63975391e9016cd89125e01642af7c42.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/mysql_src/mysql-5.1-new
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 74e2a8418dd..d7fa28debea 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5812,6 +5812,12 @@ ER_CANT_CHANGE_TX_ISOLATION 25001 eng "Transaction isolation level can't be changed while a transaction is in progress" ER_WARN_DEPRECATED_STATEMENT eng "The '%s' statement is deprecated and will be removed in MySQL %s. Please use client programs (e.g. %s) instead." - ER_SP_NO_AGGREGATE 42000 eng "AGGREGATE is not supported for stored functions" +ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR + eng "Cannot switch out of the row-based binary log format when the session has open temporary tables" +ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT + eng "Cannot change the binary logging format inside a stored function or trigger" +ER_NDB_CANT_SWITCH_BINLOG_FORMAT + eng "The NDB cluster engine does not support changing the binlog format on the fly yet" + |