diff options
| author | unknown <jimw@mysql.com> | 2006-02-17 11:03:34 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-02-17 11:03:34 -0800 |
| commit | bdf18f433188ccccec916f5c23abfbe7f2dd0bb1 (patch) | |
| tree | 5823f1009fef763217e28e43e56976f3d23ab876 /sql/share | |
| parent | 1b587ced223f6f4d2a7d683c3062d622019c9fb8 (diff) | |
| parent | d68354d56703a236e20ea4af1d3a835aa39f1941 (diff) | |
| download | mariadb-git-bdf18f433188ccccec916f5c23abfbe7f2dd0bb1.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-7955
into mysql.com:/home/jimw/my/mysql-5.1-clean
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/bdb.result:
Resolve conflict
mysql-test/t/bdb.test:
Resolve conflict
sql/share/errmsg.txt:
Resolve conflict
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index aa9cefd78b7..c8daae724c7 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5808,3 +5808,5 @@ ER_TABLE_NEEDS_UPGRADE eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!" ER_ILLEGAL_HA_CREATE_OPTION eng "Table storage engine '%-.64s' does not support the create option '%.64s'" +ER_CANT_CHANGE_TX_ISOLATION 25001 + eng "Transaction isolation level can't be changed while a transaction is in progress" |