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
216ba852
Commit
216ba852
authored
Aug 09, 2006
by
kroki/tomash@moonlight.intranet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fix.
parent
5c272816
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
sql/sql_parse.cc
sql/sql_parse.cc
+3
-6
No files found.
sql/sql_parse.cc
View file @
216ba852
...
...
@@ -6385,7 +6385,9 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
my_error
(
ER_WRONG_TABLE_NAME
,
MYF
(
0
),
table
->
table
.
str
);
DBUG_RETURN
(
0
);
}
if
(
table
->
db
.
str
&&
check_db_name
(
table
->
db
.
str
))
if
(
table
->
is_derived_table
()
==
FALSE
&&
table
->
db
.
str
&&
check_db_name
(
table
->
db
.
str
))
{
my_error
(
ER_WRONG_DB_NAME
,
MYF
(
0
),
table
->
db
.
str
);
DBUG_RETURN
(
0
);
...
...
@@ -6406,11 +6408,6 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
DBUG_RETURN
(
0
);
/* purecov: inspected */
if
(
table
->
db
.
str
)
{
if
(
table
->
is_derived_table
()
==
FALSE
&&
check_db_name
(
table
->
db
.
str
))
{
my_error
(
ER_WRONG_DB_NAME
,
MYF
(
0
),
table
->
db
.
str
);
DBUG_RETURN
(
0
);
}
ptr
->
db
=
table
->
db
.
str
;
ptr
->
db_length
=
table
->
db
.
length
;
}
...
...
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