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
cffc2141
Commit
cffc2141
authored
Mar 07, 2003
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Plain Diff
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-lookup-4.1
parents
b6a117fb
d01b3b5a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
+15
-12
sql/sql_lex.cc
sql/sql_lex.cc
+13
-8
sql/sql_lex.h
sql/sql_lex.h
+1
-2
sql/sql_parse.cc
sql/sql_parse.cc
+1
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+0
-1
No files found.
sql/sql_lex.cc
View file @
cffc2141
...
...
@@ -999,6 +999,8 @@ int yylex(void *arg, void *yythd)
void
st_select_lex_node
::
init_query
()
{
options
=
0
;
linkage
=
UNSPECIFIED_TYPE
;
no_table_names_allowed
=
uncacheable
=
dependent
=
0
;
ref_pointer_array
=
0
;
}
...
...
@@ -1016,8 +1018,8 @@ void st_select_lex_node::init_select()
void
st_select_lex_unit
::
init_query
()
{
linkage
=
GLOBAL_OPTIONS_TYPE
;
st_select_lex_node
::
init_query
();
linkage
=
GLOBAL_OPTIONS_TYPE
;
global_parameters
=
this
;
select_limit_cnt
=
HA_POS_ERROR
;
offset_limit_cnt
=
0
;
...
...
@@ -1031,11 +1033,10 @@ void st_select_lex_unit::init_query()
void
st_select_lex
::
init_query
()
{
st_select_lex_node
::
init_query
();
table_list
.
elements
=
0
;
table_list
.
first
=
0
;
table_list
.
next
=
(
byte
**
)
&
table_list
.
first
;
table_list
.
empty
();
item_list
.
empty
();
join
=
0
;
where
=
0
;
olap
=
UNSPECIFIED_OLAP_TYPE
;
having_fix_field
=
0
;
with_wild
=
0
;
...
...
@@ -1044,11 +1045,15 @@ void st_select_lex::init_query()
void
st_select_lex
::
init_select
()
{
st_select_lex_node
::
init_select
();
group_list
.
elements
=
0
;
group_list
.
first
=
0
;
group_list
.
next
=
(
byte
**
)
&
group_list
.
first
;
group_list
.
empty
();
type
=
db
=
db1
=
table1
=
db2
=
table2
=
0
;
having
=
0
;
group_list
.
empty
();
use_index_ptr
=
ignore_index_ptr
=
0
;
table_join_options
=
0
;
in_sum_expr
=
with_wild
=
0
;
options
=
0
;
where
=
having
=
0
;
braces
=
0
;
when_list
.
empty
();
expr_list
.
empty
();
interval_list
.
empty
();
...
...
sql/sql_lex.h
View file @
cffc2141
...
...
@@ -221,8 +221,7 @@ class st_select_lex_node {
static
void
*
operator
new
(
size_t
size
)
{
// TODO: Change to alloc() and explicitely clear elements in constructors
return
(
void
*
)
sql_calloc
((
uint
)
size
);
return
(
void
*
)
sql_alloc
((
uint
)
size
);
}
static
void
operator
delete
(
void
*
ptr
,
size_t
size
)
{}
st_select_lex_node
()
:
linkage
(
UNSPECIFIED_TYPE
)
{}
...
...
sql/sql_parse.cc
View file @
cffc2141
...
...
@@ -3316,7 +3316,7 @@ void mysql_init_multi_delete(LEX *lex)
lex
->
select_lex
.
select_limit
=
lex
->
unit
.
select_limit_cnt
=
HA_POS_ERROR
;
lex
->
auxilliary_table_list
=
lex
->
select_lex
.
table_list
;
lex
->
select_lex
.
init_quer
y
();
lex
->
select_lex
.
table_list
.
empt
y
();
}
...
...
sql/sql_yacc.yy
View file @
cffc2141
...
...
@@ -3359,7 +3359,6 @@ delete:
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DELETE;
lex->select_lex.options= 0;
lex->lock_option= lex->thd->update_lock_default;
lex->select_lex.init_order();
}
...
...
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