diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-05 13:41:51 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-05 13:41:51 +0300 |
| commit | d89e779ab556f9c2d8c0ffae521b7cf694af93f8 (patch) | |
| tree | eff9942a59480da2e462c761af70d6bde1a856fc /sql/share/english/errmsg.txt | |
| parent | ec522a9e63200458b50ae081e1d30247a497f21c (diff) | |
| parent | cb5790916a1ce1a4fba9803a4d49139a1ea3ecfe (diff) | |
| download | mariadb-git-d89e779ab556f9c2d8c0ffae521b7cf694af93f8.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/share/english/errmsg.txt')
| -rw-r--r-- | sql/share/english/errmsg.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 1878d6e2da2..f80d4fd48ca 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -386,3 +386,6 @@ character-set=latin1 "Illegal %s '%-.64s' value found during parsing", "CHECK OPTION on non-updatable view '%-.64s.%-.64s'" "CHECK OPTION failed '%-.64s.%-.64s'" +"Can not modify more than one base table through a join view '%-.64s.%-.64s'" +"Can not insert into join view '%-.64s.%-.64s' without fields list" +"Can not delete from join view '%-.64s.%-.64s'" |