summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-11-05 22:41:36 -0800
committerunknown <igor@rurik.mysql.com>2005-11-05 22:41:36 -0800
commit502495271ddb0e289c0bd778dbad25e089574b2c (patch)
tree4012ed65c66d6c9138db3e685f6af695438af63b /sql
parent19b733aad07f6bd0f34fdc4b85d0276169cb289c (diff)
downloadmariadb-git-502495271ddb0e289c0bd778dbad25e089574b2c.tar.gz
Post review fixes.
Diffstat (limited to 'sql')
-rw-r--r--sql/share/errmsg.txt2
-rw-r--r--sql/sql_table.cc2
2 files changed, 1 insertions, 3 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 24e1d4b6b81..f85bda90e81 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5421,5 +5421,3 @@ ER_NO_REFERENCED_ROW_2 23000
eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)"
ER_SP_BAD_VAR_SHADOW 42000
eng "Variable '%-.64s' must be quoted with `...`, or renamed"
-ER_CHECK_NOT_BASE_TABLE 42000
- eng "You cannot apply %s to a view"
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index b339e6a81e9..fb190f5524f 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2335,7 +2335,7 @@ send_result_message:
{
char buf[ERRMSGSIZE+20];
uint length= my_snprintf(buf, ERRMSGSIZE,
- ER(ER_CHECK_NOT_BASE_TABLE), operator_name);
+ ER(ER_BAD_TABLE_ERROR), table_name);
protocol->store("note", 4, system_charset_info);
protocol->store(buf, length, system_charset_info);
}