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
46989306
Commit
46989306
authored
Mar 09, 2006
by
brian@zim.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed portability issue in 5.1 to include parsers from other applications.
parent
e2ce8b21
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
sql/event_timed.cc
sql/event_timed.cc
+3
-2
sql/sql_partition.cc
sql/sql_partition.cc
+3
-2
No files found.
sql/event_timed.cc
View file @
46989306
...
...
@@ -14,13 +14,14 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define MYSQL_LEX 1
#include "event_priv.h"
#include "event.h"
#include "sp.h"
extern
int
yy
parse
(
void
*
thd
);
extern
int
MYSQL
parse
(
void
*
thd
);
/*
Init all member variables
...
...
@@ -1338,7 +1339,7 @@ Event_timed::compile(THD *thd, MEM_ROOT *mem_root)
thd
->
lex
=
&
lex
;
lex_start
(
thd
,
(
uchar
*
)
thd
->
query
,
thd
->
query_length
);
lex
.
et_compile_phase
=
TRUE
;
if
(
yy
parse
((
void
*
)
thd
)
||
thd
->
is_fatal_error
)
if
(
MYSQL
parse
((
void
*
)
thd
)
||
thd
->
is_fatal_error
)
{
DBUG_PRINT
(
"error"
,
(
"error during compile or thd->is_fatal_error=%d"
,
thd
->
is_fatal_error
));
...
...
sql/sql_partition.cc
View file @
46989306
...
...
@@ -33,6 +33,7 @@
/* Some general useful functions */
#define MYSQL_LEX 1
#include "mysql_priv.h"
#include <errno.h>
#include <m_ctype.h>
...
...
@@ -3697,7 +3698,7 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
we then save in the partition info structure.
*/
thd
->
free_list
=
NULL
;
lex
.
part_info
=
new
partition_info
();
/* Indicates
yy
parse from this place */
lex
.
part_info
=
new
partition_info
();
/* Indicates
MYSQL
parse from this place */
if
(
!
lex
.
part_info
)
{
mem_alloc_error
(
sizeof
(
partition_info
));
...
...
@@ -3706,7 +3707,7 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
lex
.
part_info
->
part_state
=
part_state
;
lex
.
part_info
->
part_state_len
=
part_state_len
;
DBUG_PRINT
(
"info"
,
(
"Parse: %s"
,
part_buf
));
if
(
yy
parse
((
void
*
)
thd
)
||
thd
->
is_fatal_error
)
if
(
MYSQL
parse
((
void
*
)
thd
)
||
thd
->
is_fatal_error
)
{
free_items
(
thd
->
free_list
);
goto
end
;
...
...
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