database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Post review fixes.

Browse Source
This commit is contained in:
igor@rurik.mysql.com
2005-11-05 22:41:36 -08:00
parent 84ad20364d
commit 0960f5fedc
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/view.result
View File

@ -2339,17 +2339,17 @@ CREATE TABLE t1(id INT);
CREATE VIEW v1 AS SELECT id FROM t1; CREATE VIEW v1 AS SELECT id FROM t1;
OPTIMIZE TABLE v1; OPTIMIZE TABLE v1;
Table Op Msg_type Msg_text 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; ANALYZE TABLE v1;
Table Op Msg_type Msg_text 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; REPAIR TABLE v1;
Table Op Msg_type Msg_text 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; DROP TABLE t1;
OPTIMIZE TABLE v1; OPTIMIZE TABLE v1;
Table Op Msg_type Msg_text 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: Warnings:
Error 1146 Table 'test.t1' doesn't exist 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 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

2
sql/share/errmsg.txt
View File

@ -5421,5 +5421,3 @@ ER_NO_REFERENCED_ROW_2 23000
eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)" eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)"
ER_SP_BAD_VAR_SHADOW 42000 ER_SP_BAD_VAR_SHADOW 42000
eng "Variable '%-.64s' must be quoted with `...`, or renamed" eng "Variable '%-.64s' must be quoted with `...`, or renamed"
ER_CHECK_NOT_BASE_TABLE 42000
eng "You cannot apply %s to a view"

2
sql/sql_table.cc
View File

@ -2335,7 +2335,7 @@ send_result_message:
{ {
char buf[ERRMSGSIZE+20]; char buf[ERRMSGSIZE+20];
uint length= my_snprintf(buf, ERRMSGSIZE, 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("note", 4, system_charset_info);
protocol->store(buf, length, system_charset_info); protocol->store(buf, length, system_charset_info);
} }