diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-06 15:56:38 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-06 15:56:38 +0300 |
| commit | 322ca2069065d2b00a0208804f2e6b0d87588c10 (patch) | |
| tree | 7cc298f1b88a43a4da02556927f340c392cebfb5 /sql/share/english/errmsg.txt | |
| parent | f1fa0d879a65a6f8da4634a0abc1f0b9abeddd78 (diff) | |
| parent | 70feaa281a895b1d4b5461a34ae6c8cc258a06fb (diff) | |
| download | mariadb-git-322ca2069065d2b00a0208804f2e6b0d87588c10.tar.gz | |
merge
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/share/english/errmsg.txt')
| -rw-r--r-- | sql/share/english/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index a60881b5df6..b89cc530130 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -361,3 +361,5 @@ character-set=latin1 "View '%-.64s.%-.64s' references invalid table(s) or column(s)" "Can't drop a %s from within another stored routine" "GOTO is not allowed in a stored procedure handler" +"CHECK OPTION on non-updatable view" +"CHECK OPTION failed" |