Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3a709f50
Commit
3a709f50
authored
Oct 17, 2006
by
cmiller@zippy.cornsilk.net
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix previous bad patch for Bug#14262.
Remove table engine qualification where it's unnecessary.
parent
ffc9538b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
mysql-test/r/view.result
mysql-test/r/view.result
+2
-2
mysql-test/t/view.test
mysql-test/t/view.test
+2
-2
sql/sql_parse.cc
sql/sql_parse.cc
+2
-0
sql/sql_view.cc
sql/sql_view.cc
+0
-1
No files found.
mysql-test/r/view.result
View file @
3a709f50
...
...
@@ -1980,7 +1980,7 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
drop view v1;
drop table t1;
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 v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
INSERT INTO t1 (col1) VALUES(12);
...
...
@@ -2032,7 +2032,7 @@ f3 f1
1 3
drop view v1;
drop table t1;
CREATE TABLE t1 (f1 char)
ENGINE = innodb
;
CREATE TABLE t1 (f1 char);
INSERT INTO t1 VALUES ('A');
CREATE VIEW v1 AS SELECT * FROM t1;
INSERT INTO t1 VALUES('B');
...
...
mysql-test/t/view.test
View file @
3a709f50
...
...
@@ -1801,7 +1801,7 @@ drop table t1;
# underlying tables (BUG#6443)
#
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
v2
(
vcol1
)
AS
SELECT
col1
FROM
t1
WHERE
col2
>
2
;
--
error
1364
...
...
@@ -1857,7 +1857,7 @@ drop table t1;
#
# 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'
);
CREATE
VIEW
v1
AS
SELECT
*
FROM
t1
;
...
...
sql/sql_parse.cc
View file @
3a709f50
...
...
@@ -4720,6 +4720,8 @@ end_with_restore_list:
{
if
(
end_active_trans
(
thd
))
goto
error
;
res
=
mysql_create_view
(
thd
,
first_table
,
thd
->
lex
->
create_view_mode
);
break
;
}
case
SQLCOM_DROP_VIEW
:
...
...
sql/sql_view.cc
View file @
3a709f50
...
...
@@ -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
(
String
(
view
->
table_name
,
system_charset_info
));
}
VOID
(
pthread_mutex_unlock
(
&
LOCK_open
));
continue
;
}
if
(
my_delete
(
path
,
MYF
(
MY_WME
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment