Commit 50249527 authored by unknown's avatar unknown
Browse files

Post review fixes.

parent 19b733aa

mysql-test/r/view.result

+4 −4
Original line number Diff line number Diff line
@@ -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

sql/share/errmsg.txt

+0 −2
Original line number Diff line number Diff line
@@ -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"

sql/sql_table.cc

+1 −1
Original line number Diff line number Diff line
@@ -2335,7 +2335,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, 
      {

        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);

      }