summaryrefslogtreecommitdiff
path: root/sql/share/hungarian/errmsg.txt
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-10-05 13:41:51 +0300
committerunknown <bell@sanja.is.com.ua>2004-10-05 13:41:51 +0300
commit75730fb37e4a730df1dca83da9c8ff63c7122491 (patch)
treeeff9942a59480da2e462c761af70d6bde1a856fc /sql/share/hungarian/errmsg.txt
parentdc25de58e58bf64c82e290b5c625fb68caa82953 (diff)
parent9aa459f0df7e000224e4ac54c5009eac42ef365a (diff)
downloadmariadb-git-75730fb37e4a730df1dca83da9c8ff63c7122491.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/hungarian/errmsg.txt')
-rw-r--r--sql/share/hungarian/errmsg.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 0b410dc1ac7..d6cbab6c271 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -391,3 +391,6 @@ character-set=latin2
"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'"