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/norwegian-ny | |
| 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/norwegian-ny')
| -rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 5 |
1 files changed, 5 insertions, 0 deletions
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" |