diff options
author | unknown <dlenev@mysql.com> | 2004-09-08 13:29:21 +0400 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2004-09-08 13:29:21 +0400 |
commit | cab6f8df6ddb35fbdef771eb56217bb0920be25b (patch) | |
tree | a103ef36c1230a085165269c481e5e135b27550d /sql/share | |
parent | 9243aa9ebe800724497316a8eb1bbab1d1065db6 (diff) | |
parent | 52ac4935e7e00218bf7abde7b841a2e5111cc819 (diff) | |
download | mariadb-git-cab6f8df6ddb35fbdef771eb56217bb0920be25b.tar.gz |
Merge of changes from the main tree to tree for WL#1218 "Triggers".
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/parse_file.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
include/mysqld_error.h:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/share/czech/errmsg.txt:
Manual merge.
sql/share/danish/errmsg.txt:
Manual merge.
sql/share/dutch/errmsg.txt:
Manual merge.
sql/share/english/errmsg.txt:
Manual merge.
sql/share/estonian/errmsg.txt:
Manual merge.
sql/share/french/errmsg.txt:
Manual merge.
sql/share/german/errmsg.txt:
Manual merge.
sql/share/greek/errmsg.txt:
Manual merge.
sql/share/hungarian/errmsg.txt:
Manual merge.
sql/share/italian/errmsg.txt:
Manual merge.
sql/share/japanese/errmsg.txt:
Manual merge.
sql/share/korean/errmsg.txt:
Manual merge.
sql/share/norwegian-ny/errmsg.txt:
Manual merge.
sql/share/norwegian/errmsg.txt:
Manual merge.
sql/share/polish/errmsg.txt:
Manual merge.
sql/share/portuguese/errmsg.txt:
Manual merge.
sql/share/romanian/errmsg.txt:
Manual merge.
sql/share/russian/errmsg.txt:
Manual merge.
sql/share/serbian/errmsg.txt:
Manual merge.
sql/share/slovak/errmsg.txt:
Manual merge.
sql/share/spanish/errmsg.txt:
Manual merge.
sql/share/swedish/errmsg.txt:
Manual merge.
sql/share/ukrainian/errmsg.txt:
Manual merge.
sql/sp_head.cc:
Manual merge.
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/czech/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/danish/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/dutch/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/english/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/estonian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/french/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/german/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/greek/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/hungarian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/italian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/japanese/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/korean/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/norwegian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/polish/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/portuguese/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/romanian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/russian/errmsg.txt | 7 | ||||
-rw-r--r-- | sql/share/serbian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/slovak/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/spanish/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/swedish/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/ukrainian/errmsg.txt | 5 |
23 files changed, 116 insertions, 1 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 35310f5210f..aa23a7a005a 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -370,3 +370,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index d6a0a9d81e8..ac66eff0b5f 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -364,3 +364,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index 8fd5277d4ec..1f85a9ed42f 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -372,3 +372,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index a60881b5df6..ebf58088c9f 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -361,3 +361,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 2e8a9270cd3..b446f133241 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -366,3 +366,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index b8ec7866a68..db5647abcb6 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -361,3 +361,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index c28792cc8c6..ae9110ff301 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -373,3 +373,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index 8ceb24bd376..c674d038b16 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -361,3 +361,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index f47684f9225..47ff00223af 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -363,3 +363,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index eb241ef08a0..eae07ddefcc 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -361,3 +361,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 166d6e8e1c1..5c36473eda8 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -363,3 +363,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index 66486fd8a0f..1e1ffbeec20 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -361,3 +361,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 739d40178df..5e6879dd415 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -363,3 +363,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index 227e16e1590..0f97b65a46f 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -363,3 +363,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index 62e10e778f2..aed5d1c5827 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -365,3 +365,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 08c03fcaf2a..b2acb008932 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -362,3 +362,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index 0f6df4f919b..f065504da5b 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -365,3 +365,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index 71c983ff55e..56b0b9c8953 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -360,6 +360,11 @@ character-set=koi8r "View SELECT и список полей view имеют разное количество столбцов" "Алгоритм слияния view не может быть использован сейчас (алгоритм будет неопеределенным)" "Обновляемый view не содержит ключа использованной в нем таблиц(ы)" -"View '%-.64s.%-.64s' ссылается на несуществующие таблицы или слолбцы" +"View '%-.64s.%-.64s' ссылается на несуществующие таблицы или столбцы" "Can't drop a %s from within another stored routine" "GOTO is not allowed in a stored procedure handler" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index bff4fad6108..a3ecba11e2e 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -367,3 +367,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index 363ba86afc7..88be98bb6f4 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -369,3 +369,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index 7ab9b416c2e..c35a2b9a917 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -363,3 +363,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index b7add017e44..00c3e4b0016 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -361,3 +361,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index 364a2a03c16..c5329fccaea 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -366,3 +366,8 @@ 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" +"Trigger already exists" +"Trigger does not exist" +"Trigger's '%-.64s' is view or temporary table" +"Updating of %s row is not allowed in %strigger" +"There is no %s row in %s trigger" |