diff options
author | unknown <bell@sanja.is.com.ua> | 2004-09-03 15:18:40 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-09-03 15:18:40 +0300 |
commit | 704fb6daf749e66d39a7155c1e7f9465733ec140 (patch) | |
tree | 887af5e66cac0f28f08971bc57b9d874c53dc747 /sql/share | |
parent | 2c3f49a64d773395cc0e41fb35c5b6e3b5a56871 (diff) | |
download | mariadb-git-704fb6daf749e66d39a7155c1e7f9465733ec140.tar.gz |
CHECK OPTIONs added (WL#1983)
include/mysqld_error.h:
new error messages
mysql-test/r/view.result:
test of CHECK OPTION in a views
mysql-test/t/view.test:
test of CHECK OPTION in a views
sql/share/czech/errmsg.txt:
new error messages
sql/share/danish/errmsg.txt:
new error messages
sql/share/dutch/errmsg.txt:
new error messages
sql/share/english/errmsg.txt:
new error messages
sql/share/estonian/errmsg.txt:
new error messages
sql/share/french/errmsg.txt:
new error messages
sql/share/german/errmsg.txt:
new error messages
sql/share/greek/errmsg.txt:
new error messages
sql/share/hungarian/errmsg.txt:
new error messages
sql/share/italian/errmsg.txt:
new error messages
sql/share/japanese/errmsg.txt:
new error messages
sql/share/korean/errmsg.txt:
new error messages
sql/share/norwegian-ny/errmsg.txt:
new error messages
sql/share/norwegian/errmsg.txt:
new error messages
sql/share/polish/errmsg.txt:
new error messages
sql/share/portuguese/errmsg.txt:
new error messages
sql/share/romanian/errmsg.txt:
new error messages
sql/share/russian/errmsg.txt:
new error messages
sql/share/serbian/errmsg.txt:
new error messages
sql/share/slovak/errmsg.txt:
new error messages
sql/share/spanish/errmsg.txt:
new error messages
sql/share/swedish/errmsg.txt:
new error messages
sql/share/ukrainian/errmsg.txt:
new error messages
sql/sql_insert.cc:
CHECK OPTIONs added
sql/sql_lex.h:
CHECK OPTIONs added
sql/sql_update.cc:
CHECK OPTIONs added
sql/sql_view.cc:
new parameter added
returnrd values fixed
sql/sql_yacc.yy:
CHECK OPTIONs added
sql/table.cc:
CHECK OPTIONs added
sql/table.h:
CHECK OPTIONs added
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/czech/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/danish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/dutch/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/english/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/estonian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/french/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/german/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/greek/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/hungarian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/italian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/japanese/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/korean/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/norwegian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/polish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/portuguese/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/romanian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/russian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/serbian/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/slovak/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/spanish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/swedish/errmsg.txt | 2 | ||||
-rw-r--r-- | sql/share/ukrainian/errmsg.txt | 2 |
23 files changed, 46 insertions, 0 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 9d1c429d5b6..67b27fbaab5 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -370,3 +370,5 @@ character-set=latin2 "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" diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index b2d2fdf4d77..b114ca95bec 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -364,3 +364,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" diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index 85c0443869f..b1d5688bede 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -372,3 +372,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" diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 641f267d67e..561d08c57c8 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" diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index e64c0c17e74..66f6d93d301 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -366,3 +366,5 @@ character-set=latin7 "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" diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index f3443457346..41c7a0a1b44 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/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" diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 498a230faed..a0467836f72 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -373,3 +373,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" diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index 2827517ba9a..5746be6c955 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -361,3 +361,5 @@ character-set=greek "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" diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index fab0b156322..c411bcc5dc9 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -363,3 +363,5 @@ character-set=latin2 "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" diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 24634514a23..c01b37132a0 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/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" diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 68f2857aeca..ee2b1ed4d9f 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -363,3 +363,5 @@ character-set=ujis "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" diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index 70267c82364..2a44095a5c9 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -361,3 +361,5 @@ character-set=euckr "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" diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 1d84a3a5e5a..3b5de96ddd7 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -363,3 +363,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" diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index be881d54473..d2a8b505cd6 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -363,3 +363,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" diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 8a576b5bf82..89cb546c668 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -365,3 +365,5 @@ character-set=latin2 "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" diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 6794db726cc..f308d7eac1d 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -362,3 +362,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" diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index 9eaa4860b64..ef56babaca0 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -365,3 +365,5 @@ character-set=latin2 "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" diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index eec85d611fc..fbb41c886c4 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -363,3 +363,5 @@ character-set=koi8r "View '%-.64s.%-.64s' ссылается на несуществующие таблицы или слолбцы" "Can't drop a %s from within another stored routine" "GOTO is not allowed in a stored procedure handler" +"CHECK OPTION для необновляемого VIEW" +"проверка CHECK OPTION провалилась" diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index 4039268f446..265c77f576f 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -367,3 +367,5 @@ character-set=cp1250 "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" diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index 9be5ce01d6a..4575fa5b7c6 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -369,3 +369,5 @@ character-set=latin2 "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" diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index dc15f8b8d5e..d2df49488ff 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -363,3 +363,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" diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index ee5436c3b80..efd5640ddfd 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/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" diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index cb1d99e2fec..503124d7a55 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -366,3 +366,5 @@ character-set=koi8u "View '%-.64s.%-.64s' посила╓тся на не╕снуюч╕ таблиц╕ або стовбц╕" "Can't drop a %s from within another stored routine" "GOTO is not allowed in a stored procedure handler" +"CHECK OPTION для VIEW що не може бути оновленним" +"перев╕рка CHECK OPTION не пройшла" |