diff options
| author | unknown <igor@rurik.mysql.com> | 2005-11-05 22:41:36 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-11-05 22:41:36 -0800 |
| commit | 502495271ddb0e289c0bd778dbad25e089574b2c (patch) | |
| tree | 4012ed65c66d6c9138db3e685f6af695438af63b | |
| parent | 19b733aad07f6bd0f34fdc4b85d0276169cb289c (diff) | |
| download | mariadb-git-502495271ddb0e289c0bd778dbad25e089574b2c.tar.gz | |
Post review fixes.
| -rw-r--r-- | mysql-test/r/view.result | 8 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 9b434ebe9f4..b92a50d079f 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2339,17 +2339,17 @@ CREATE TABLE t1(id INT); CREATE VIEW v1 AS SELECT id FROM t1; OPTIMIZE TABLE v1; Table Op Msg_type Msg_text -test.v1 optimize note You cannot apply optimize to a view +test.v1 optimize note Unknown table 'test.v1' ANALYZE TABLE v1; Table Op Msg_type Msg_text -test.v1 analyze note You cannot apply analyze to a view +test.v1 analyze note Unknown table 'test.v1' REPAIR TABLE v1; Table Op Msg_type Msg_text -test.v1 repair note You cannot apply repair to a view +test.v1 repair note Unknown table 'test.v1' DROP TABLE t1; OPTIMIZE TABLE v1; Table Op Msg_type Msg_text -test.v1 optimize note You cannot apply optimize to a view +test.v1 optimize note Unknown table 'test.v1' Warnings: Error 1146 Table 'test.t1' doesn't exist Error 1356 View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them 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); } |