1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix previous bad patch for Bug#14262.

Browse Source 
Remove table engine qualification where it's unnecessary.


mysql-test/r/view.result:
  Remove requirement for innodb where not needed.  (Running this test alone
  raised warnings that it was using myisam.)
mysql-test/t/view.test:
  Remove requirement for innodb where not needed.  (Running this test alone
  raised warnings that it was using myisam.)
sql/sql_parse.cc:
  Fix previous bad re-patch.
sql/sql_view.cc:
  Fix previous bad re-patch.
This commit is contained in:
unknown 2006-10-17 11:06:11 -04:00
parent b2bf4843c7
commit 48dfeb4de0
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
mysql-test/t/view.test
View File

@ -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;
# #
# 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;

2
sql/sql_parse.cc
View File

@ -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:

1
sql/sql_view.cc
View File

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