Commit 3e2e44f0 authored by unknown's avatar unknown

Post review fixes.


sql/sql_table.cc:
  Post review fixes
parent ae68221d
...@@ -2323,7 +2323,7 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -2323,7 +2323,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t3 ALL NULL NULL NULL NULL 3 Using where 1 PRIMARY t3 ALL NULL NULL NULL NULL 3 Using where
DROP VIEW v1,v2; DROP VIEW v1,v2;
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
CREATE TABLE t1(id INT) ENGINE=MyISAM; 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
......
...@@ -2193,7 +2193,7 @@ DROP TABLE t1,t2,t3; ...@@ -2193,7 +2193,7 @@ DROP TABLE t1,t2,t3;
# Bug #14540: OPTIMIZE, ANALYZE, REPAIR applied to not a view # Bug #14540: OPTIMIZE, ANALYZE, REPAIR applied to not a view
# #
CREATE TABLE t1(id INT) ENGINE=MyISAM; 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;
......
...@@ -5421,5 +5421,5 @@ ER_NO_REFERENCED_ROW_2 23000 ...@@ -5421,5 +5421,5 @@ 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 4200 ER_CHECK_NOT_BASE_TABLE 42000
eng "You cannot apply %s to a view" eng "You cannot apply %s to a view"
...@@ -2326,11 +2326,11 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -2326,11 +2326,11 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
case HA_ADMIN_NOT_BASE_TABLE: case HA_ADMIN_NOT_BASE_TABLE:
{ {
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_CHECK_NOT_BASE_TABLE), operator_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);
} }
break; break;
...@@ -2442,7 +2442,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -2442,7 +2442,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
{ {
pthread_mutex_lock(&LOCK_open); pthread_mutex_lock(&LOCK_open);
remove_table_from_cache(thd, table->table->s->db, remove_table_from_cache(thd, table->table->s->db,
table->table->s->table_name, RTFC_NO_FLAG); table->table->s->table_name, RTFC_NO_FLAG);
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);
/* Something may be modified, that's why we have to invalidate cache */ /* Something may be modified, that's why we have to invalidate cache */
query_cache_invalidate3(thd, table->table, 0); query_cache_invalidate3(thd, table->table, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment