diff options
author | unknown <bell@sanja.is.com.ua> | 2004-09-29 17:10:17 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-09-29 17:10:17 +0300 |
commit | 40ac8462d5be643fdc4e7397794ae6cb0e5b4f3e (patch) | |
tree | aeac5ada3224a0f38d6477026dfc659193a88437 /sql/share/english/errmsg.txt | |
parent | f9ae154da46994d3333166c75466f3cd5ba6653d (diff) | |
parent | e05e18606be069b79d44ca004315293cd1ac5ed8 (diff) | |
download | mariadb-git-40ac8462d5be643fdc4e7397794ae6cb0e5b4f3e.tar.gz |
merge
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/share/english/errmsg.txt')
-rw-r--r-- | sql/share/english/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 0b502244a64..fff31871bf4 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -380,3 +380,5 @@ character-set=latin1 "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" +"CHECK OPTION on non-updatable view '%-.64s.%-.64s'" +"CHECK OPTION failed '%-.64s.%-.64s'" |