diff options
| author | unknown <dlenev@mysql.com> | 2005-08-23 09:15:05 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-08-23 09:15:05 +0400 |
| commit | 6658fb34e5a84ac802eda476b6bdd12fbfcd9d30 (patch) | |
| tree | 467166d0a2ca0bce473af30660ebeb4b83dc6792 /sql/share | |
| parent | 4be08544d528ddd9ecf0a2f13ec6c7da6943bda3 (diff) | |
| parent | b1921c85ba5e1892af48df31ad38a89f65989012 (diff) | |
| download | mariadb-git-6658fb34e5a84ac802eda476b6bdd12fbfcd9d30.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg11896
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/r/trigger.result:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
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 65afefef35a..b49b7248021 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5397,3 +5397,5 @@ ER_XAER_DUPID XAE08 eng "XAER_DUPID: The XID already exists" ER_DATETIME_FUNCTION_OVERFLOW 22008 eng "Datetime function: %-.32s field overflow" +ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG + eng "Can't update table '%-.64s' in stored function/trigger because it is already used by statement which invoked this stored function/trigger." |