diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-08-23 23:17:36 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-08-23 23:17:36 +0300 |
| commit | eb7c4ff2dbcfcc0292dcd1ff577b1d203463834c (patch) | |
| tree | b23f9eadbed55b7a8cbac4da9ef2cc8338d7fa44 /sql/share | |
| parent | 142f65834b73e99cce98d9c537c22584bdd81033 (diff) | |
| parent | 705118d1f627c6aa9a14f2a00f080b13af7b3484 (diff) | |
| download | mariadb-git-eb7c4ff2dbcfcc0292dcd1ff577b1d203463834c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
BitKeeper/etc/config:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/view.result:
merge
mysql-test/t/view.test:
merge
sql/share/errmsg.txt:
merge
sql/sql_insert.cc:
merge
sql/table.h:
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 b49b7248021..81e953e3a5d 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5399,3 +5399,5 @@ 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." +ER_VIEW_PREVENT_UPDATE + eng "The definition of table '%-.64s' prevents operation %s on table '%-.64s'." |