diff options
| author | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-21 08:03:52 -0500 |
|---|---|---|
| committer | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-21 08:03:52 -0500 |
| commit | 26416bf5448f45a171fb1e0e28c425f401b1a0aa (patch) | |
| tree | cd8b06154812c8fdd31ac76addbb7e0f2ce187c6 /sql/share | |
| parent | 5c9afee608aef412065a90b10032d5ce23c12b1d (diff) | |
| parent | a95646be8d1d56b8ee68ae991ba3c760d9071b94 (diff) | |
| download | mariadb-git-26416bf5448f45a171fb1e0e28c425f401b1a0aa.tar.gz | |
Merge c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-bugs
into c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Manual merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 35ff2e4222b..73d1abf8fdd 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5812,4 +5812,5 @@ 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_TABLE_LOG_ERROR + eng "Error in table log" |