summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2005-09-14 13:37:40 +0300
committerunknown <bell@sanja.is.com.ua>2005-09-14 13:37:40 +0300
commit33b1d6f63d32b3ea4263ac30bd5a9b53f7911769 (patch)
treef1b9680017a64e5a702ab28a502fcdd4489c260c /sql/share
parent89e0804df0b1727b90e8d583f5bf40fc7a3259e9 (diff)
parent2fcdbb8d7e11d7f067aa3b17ecc02f106344cf81 (diff)
downloadmariadb-git-33b1d6f63d32b3ea4263ac30bd5a9b53f7911769.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0 sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: merge
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 57e70c6acb6..9f6bc72ab81 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5405,3 +5405,11 @@ ER_PS_NO_RECURSION
eng "The prepared statement contains a stored routine call that refers to that same statement. It's not allowed to execute a prepared statement in such a recursive manner"
ER_SP_CANT_SET_AUTOCOMMIT
eng "Not allowed to set autocommit from a stored function or trigger"
+ER_NO_VIEW_USER
+ eng "View definer is not fully qualified"
+ER_VIEW_FRM_NO_USER
+ eng "View %-.64s.%-.64s has not definer information (old table format). Current user is used as definer. Please recreate view!"
+ER_VIEW_OTHER_USER
+ eng "You need the SUPER privilege for creation view with %-.64s@%-.64s definer"
+ER_NO_SUCH_USER
+ eng "There is not %-.64s@%-.64s registered"