Fix previous bad patch for Bug#14262.

Remove table engine qualification where it's unnecessary.
parent ffc9538b
...@@ -1980,7 +1980,7 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI ...@@ -1980,7 +1980,7 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
drop view v1; drop view v1;
drop table t1; drop table t1;
set sql_mode='strict_all_tables'; set sql_mode='strict_all_tables';
CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB; CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL);
CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1; CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;
CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2; CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
INSERT INTO t1 (col1) VALUES(12); INSERT INTO t1 (col1) VALUES(12);
...@@ -2032,7 +2032,7 @@ f3 f1 ...@@ -2032,7 +2032,7 @@ f3 f1
1 3 1 3
drop view v1; drop view v1;
drop table t1; drop table t1;
CREATE TABLE t1 (f1 char) ENGINE = innodb; CREATE TABLE t1 (f1 char);
INSERT INTO t1 VALUES ('A'); INSERT INTO t1 VALUES ('A');
CREATE VIEW v1 AS SELECT * FROM t1; CREATE VIEW v1 AS SELECT * FROM t1;
INSERT INTO t1 VALUES('B'); INSERT INTO t1 VALUES('B');
......
...@@ -1801,7 +1801,7 @@ drop table t1; ...@@ -1801,7 +1801,7 @@ drop table t1;
# underlying tables (BUG#6443) # underlying tables (BUG#6443)
# #
set sql_mode='strict_all_tables'; set sql_mode='strict_all_tables';
CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB; CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL);
CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1; CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;
CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2; CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
-- error 1364 -- error 1364
...@@ -1857,7 +1857,7 @@ drop table t1; ...@@ -1857,7 +1857,7 @@ drop table t1;
# #
# Test for bug #11771: wrong query_id in SELECT * FROM <view> # Test for bug #11771: wrong query_id in SELECT * FROM <view>
# #
CREATE TABLE t1 (f1 char) ENGINE = innodb; CREATE TABLE t1 (f1 char);
INSERT INTO t1 VALUES ('A'); INSERT INTO t1 VALUES ('A');
CREATE VIEW v1 AS SELECT * FROM t1; CREATE VIEW v1 AS SELECT * FROM t1;
......
...@@ -4720,6 +4720,8 @@ end_with_restore_list: ...@@ -4720,6 +4720,8 @@ end_with_restore_list:
{ {
if (end_active_trans(thd)) if (end_active_trans(thd))
goto error; goto error;
res= mysql_create_view(thd, first_table, thd->lex->create_view_mode);
break; break;
} }
case SQLCOM_DROP_VIEW: case SQLCOM_DROP_VIEW:
......
...@@ -1384,7 +1384,6 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) ...@@ -1384,7 +1384,6 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
non_existant_views.append(','); non_existant_views.append(',');
non_existant_views.append(String(view->table_name,system_charset_info)); non_existant_views.append(String(view->table_name,system_charset_info));
} }
VOID(pthread_mutex_unlock(&LOCK_open));
continue; continue;
} }
if (my_delete(path, MYF(MY_WME))) if (my_delete(path, MYF(MY_WME)))
......
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