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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
99d3f217
Commit
99d3f217
authored
Oct 28, 2017
by
Galina Shalygina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mistakes corrected, variable defined.
parent
a4ded0a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
sql/sql_lex.cc
sql/sql_lex.cc
+2
-3
sql/sql_priv.h
sql/sql_priv.h
+1
-1
No files found.
sql/sql_lex.cc
View file @
99d3f217
...
@@ -1350,9 +1350,8 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd)
...
@@ -1350,9 +1350,8 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd)
}
}
break
;
break
;
case
VALUES
:
case
VALUES
:
if
(
thd
->
lex
->
current_select
->
parsing_place
==
IN_UPDATE_ON_DUP_KEY
if
(
thd
->
lex
->
current_select
->
parsing_place
==
IN_UPDATE_ON_DUP_KEY
||
// || thd->lex->current_select->parsing_place == IN_PARTITIONING
thd
->
lex
->
current_select
->
parsing_place
==
IN_PART_FUNC
)
)
return
VALUE_SYM
;
return
VALUE_SYM
;
token
=
lex_one_token
(
yylval
,
thd
);
token
=
lex_one_token
(
yylval
,
thd
);
lip
->
add_digest_token
(
token
,
yylval
);
lip
->
add_digest_token
(
token
,
yylval
);
...
...
sql/sql_priv.h
View file @
99d3f217
...
@@ -350,7 +350,7 @@ enum enum_parsing_place
...
@@ -350,7 +350,7 @@ enum enum_parsing_place
IN_GROUP_BY
,
IN_GROUP_BY
,
IN_ORDER_BY
,
IN_ORDER_BY
,
IN_UPDATE_ON_DUP_KEY
,
IN_UPDATE_ON_DUP_KEY
,
IN_PART
ITIONING
,
IN_PART
_FUNC
,
PARSING_PLACE_SIZE
/* always should be the last */
PARSING_PLACE_SIZE
/* always should be the last */
};
};
...
...
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