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
48558055
Commit
48558055
authored
Feb 10, 2003
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move tmp_table_used to THD
Optimize depending sub querys Remove valgrind warnings
parent
aee7346e
Changes
19
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
240 additions
and
207 deletions
+240
-207
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+1
-2
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+1
-1
mysql-test/r/subselect.result
mysql-test/r/subselect.result
+124
-109
mysql-test/t/subselect.test
mysql-test/t/subselect.test
+79
-68
sql/item.cc
sql/item.cc
+1
-1
sql/item.h
sql/item.h
+6
-3
sql/item_func.cc
sql/item_func.cc
+2
-2
sql/item_row.cc
sql/item_row.cc
+1
-1
sql/item_strfunc.h
sql/item_strfunc.h
+1
-1
sql/item_subselect.cc
sql/item_subselect.cc
+2
-2
sql/log_event.cc
sql/log_event.cc
+1
-1
sql/sql_base.cc
sql/sql_base.cc
+1
-1
sql/sql_class.cc
sql/sql_class.cc
+1
-1
sql/sql_class.h
sql/sql_class.h
+1
-0
sql/sql_lex.cc
sql/sql_lex.cc
+1
-3
sql/sql_lex.h
sql/sql_lex.h
+2
-1
sql/sql_parse.cc
sql/sql_parse.cc
+1
-0
sql/sql_select.cc
sql/sql_select.cc
+12
-8
sql/sql_table.cc
sql/sql_table.cc
+2
-2
No files found.
libmysqld/lib_sql.cc
View file @
48558055
...
@@ -63,8 +63,7 @@ my_bool simple_command(MYSQL *mysql,enum enum_server_command command,
...
@@ -63,8 +63,7 @@ my_bool simple_command(MYSQL *mysql,enum enum_server_command command,
}
}
/* Clear result variables */
/* Clear result variables */
thd
->
net
.
last_error
[
0
]
=
0
;
thd
->
clear_error
();
thd
->
net
.
last_errno
=
0
;
mysql
->
affected_rows
=
~
(
my_ulonglong
)
0
;
mysql
->
affected_rows
=
~
(
my_ulonglong
)
0
;
thd
->
store_globals
();
// Fix if more than one connect
thd
->
store_globals
();
// Fix if more than one connect
...
...
mysql-test/mysql-test-run.sh
View file @
48558055
...
@@ -623,7 +623,7 @@ report_stats () {
...
@@ -623,7 +623,7 @@ report_stats () {
# Find errors
# Find errors
for
i
in
"^Warning:"
"^Error:"
"^==.* at 0x"
for
i
in
"^Warning:"
"^Error:"
"^==.* at 0x"
do
do
if
`
$GREP
"
$i
"
$MY_LOG_DIR
/warnings.tmp
>>
$MY_LOG_DIR
/warnings
`
if
$GREP
"
$i
"
$MY_LOG_DIR
/warnings.tmp
>>
$MY_LOG_DIR
/warnings
then
then
found_error
=
1
found_error
=
1
fi
fi
...
...
mysql-test/r/subselect.result
View file @
48558055
This diff is collapsed.
Click to expand it.
mysql-test/t/subselect.test
View file @
48558055
...
@@ -378,79 +378,90 @@ drop table t1, t2, t3;
...
@@ -378,79 +378,90 @@ drop table t1, t2, t3;
--
error
1096
--
error
1096
SELECT
*
FROM
(
SELECT
1
)
b
WHERE
1
IN
(
SELECT
*
);
SELECT
*
FROM
(
SELECT
1
)
b
WHERE
1
IN
(
SELECT
*
);
CREATE
TABLE
t
(
id
int
(
11
)
default
NULL
,
KEY
id
(
id
))
TYPE
=
MyISAM
CHARSET
=
latin1
;
CREATE
TABLE
t
2
(
id
int
(
11
)
default
NULL
,
KEY
id
(
id
))
TYPE
=
MyISAM
CHARSET
=
latin1
;
INSERT
INTO
t
VALUES
(
1
),(
2
);
INSERT
INTO
t
2
VALUES
(
1
),(
2
);
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
1
);
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
1
);
EXPLAIN
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
1
);
EXPLAIN
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
1
);
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
1
UNION
SELECT
3
);
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
1
UNION
SELECT
3
);
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
1
+
(
select
1
));
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
1
+
(
select
1
));
EXPLAIN
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
1
+
(
select
1
));
EXPLAIN
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
1
+
(
select
1
));
EXPLAIN
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
1
UNION
SELECT
3
);
EXPLAIN
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
1
UNION
SELECT
3
);
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
5
UNION
SELECT
3
);
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
5
UNION
SELECT
3
);
SELECT
*
FROM
t
WHERE
id
IN
(
SELECT
5
UNION
SELECT
2
);
SELECT
*
FROM
t
2
WHERE
id
IN
(
SELECT
5
UNION
SELECT
2
);
--
error
1093
--
error
1093
INSERT
INTO
t
VALUES
((
SELECT
*
FROM
t
));
INSERT
INTO
t
2
VALUES
((
SELECT
*
FROM
t2
));
SELECT
*
FROM
t
;
SELECT
*
FROM
t
2
;
CREATE
TABLE
t1
(
id
int
(
11
)
default
NULL
,
KEY
id
(
id
))
TYPE
=
MyISAM
CHARSET
=
latin1
;
CREATE
TABLE
t1
(
id
int
(
11
)
default
NULL
,
KEY
id
(
id
))
TYPE
=
MyISAM
CHARSET
=
latin1
;
INSERT
INTO
t1
values
(
1
),(
1
);
INSERT
INTO
t1
values
(
1
),(
1
);
--
error
1240
--
error
1240
UPDATE
t
SET
id
=
(
SELECT
*
FROM
t1
);
UPDATE
t2
SET
id
=
(
SELECT
*
FROM
t1
);
drop
table
t
,
t1
;
drop
table
t2
,
t1
;
#NULL test
#NULL test
create
table
t
(
a
int
);
create
table
t1
(
a
int
);
insert
into
t
values
(
1
),(
2
),(
3
);
insert
into
t1
values
(
1
),(
2
),(
3
);
select
1
IN
(
SELECT
*
from
t
);
select
1
IN
(
SELECT
*
from
t1
);
select
10
IN
(
SELECT
*
from
t
);
select
10
IN
(
SELECT
*
from
t1
);
select
NULL
IN
(
SELECT
*
from
t
);
select
NULL
IN
(
SELECT
*
from
t1
);
update
t
set
a
=
NULL
where
a
=
2
;
update
t1
set
a
=
NULL
where
a
=
2
;
select
1
IN
(
SELECT
*
from
t
);
select
1
IN
(
SELECT
*
from
t1
);
select
3
IN
(
SELECT
*
from
t
);
select
3
IN
(
SELECT
*
from
t1
);
select
10
IN
(
SELECT
*
from
t
);
select
10
IN
(
SELECT
*
from
t1
);
select
1
>
ALL
(
SELECT
*
from
t
);
select
1
>
ALL
(
SELECT
*
from
t1
);
select
10
>
ALL
(
SELECT
*
from
t
);
select
10
>
ALL
(
SELECT
*
from
t1
);
select
1
>
ANY
(
SELECT
*
from
t
);
select
1
>
ANY
(
SELECT
*
from
t1
);
select
10
>
ANY
(
SELECT
*
from
t
);
select
10
>
ANY
(
SELECT
*
from
t1
);
drop
table
t
;
drop
table
t1
;
create
table
t
(
a
varchar
(
20
));
create
table
t1
(
a
varchar
(
20
));
insert
into
t
values
(
'A'
),(
'BC'
),(
'DEF'
);
insert
into
t1
values
(
'A'
),(
'BC'
),(
'DEF'
);
select
'A'
IN
(
SELECT
*
from
t
);
select
'A'
IN
(
SELECT
*
from
t1
);
select
'XYZS'
IN
(
SELECT
*
from
t
);
select
'XYZS'
IN
(
SELECT
*
from
t1
);
select
NULL
IN
(
SELECT
*
from
t
);
select
NULL
IN
(
SELECT
*
from
t1
);
update
t
set
a
=
NULL
where
a
=
'BC'
;
update
t1
set
a
=
NULL
where
a
=
'BC'
;
select
'A'
IN
(
SELECT
*
from
t
);
select
'A'
IN
(
SELECT
*
from
t1
);
select
'DEF'
IN
(
SELECT
*
from
t
);
select
'DEF'
IN
(
SELECT
*
from
t1
);
select
'XYZS'
IN
(
SELECT
*
from
t
);
select
'XYZS'
IN
(
SELECT
*
from
t1
);
select
'A'
>
ALL
(
SELECT
*
from
t
);
select
'A'
>
ALL
(
SELECT
*
from
t1
);
select
'XYZS'
>
ALL
(
SELECT
*
from
t
);
select
'XYZS'
>
ALL
(
SELECT
*
from
t1
);
select
'A'
>
ANY
(
SELECT
*
from
t
);
select
'A'
>
ANY
(
SELECT
*
from
t1
);
select
'XYZS'
>
ANY
(
SELECT
*
from
t
);
select
'XYZS'
>
ANY
(
SELECT
*
from
t1
);
drop
table
t
;
drop
table
t1
;
create
table
t
(
a
float
);
create
table
t1
(
a
float
);
insert
into
t
values
(
1.5
),(
2.5
),(
3.5
);
insert
into
t1
values
(
1.5
),(
2.5
),(
3.5
);
select
1.5
IN
(
SELECT
*
from
t
);
select
1.5
IN
(
SELECT
*
from
t1
);
select
10.5
IN
(
SELECT
*
from
t
);
select
10.5
IN
(
SELECT
*
from
t1
);
select
NULL
IN
(
SELECT
*
from
t
);
select
NULL
IN
(
SELECT
*
from
t1
);
update
t
set
a
=
NULL
where
a
=
2.5
;
update
t1
set
a
=
NULL
where
a
=
2.5
;
select
1.5
IN
(
SELECT
*
from
t
);
select
1.5
IN
(
SELECT
*
from
t1
);
select
3.5
IN
(
SELECT
*
from
t
);
select
3.5
IN
(
SELECT
*
from
t1
);
select
10.5
IN
(
SELECT
*
from
t
);
select
10.5
IN
(
SELECT
*
from
t1
);
select
1.5
>
ALL
(
SELECT
*
from
t
);
select
1.5
>
ALL
(
SELECT
*
from
t1
);
select
10.5
>
ALL
(
SELECT
*
from
t
);
select
10.5
>
ALL
(
SELECT
*
from
t1
);
select
1.5
>
ANY
(
SELECT
*
from
t
);
select
1.5
>
ANY
(
SELECT
*
from
t1
);
select
10.5
>
ANY
(
SELECT
*
from
t
);
select
10.5
>
ANY
(
SELECT
*
from
t1
);
explain
select
(
select
a
+
1
)
from
t
;
explain
select
(
select
a
+
1
)
from
t1
;
select
(
select
a
+
1
)
from
t
;
select
(
select
a
+
1
)
from
t1
;
drop
table
t
;
drop
table
t1
;
#
# Null with keys
#
CREATE
TABLE
t1
(
a
int
(
11
)
NOT
NULL
default
'0'
,
PRIMARY
KEY
(
a
));
CREATE
TABLE
t2
(
a
int
(
11
)
default
'0'
,
INDEX
(
a
));
INSERT
INTO
t1
VALUES
(
1
),(
2
),(
3
),(
4
);
INSERT
INTO
t2
VALUES
(
1
),(
2
),(
3
);
SELECT
t1
.
a
,
t1
.
a
in
(
select
t2
.
a
from
t2
)
FROM
t1
;
explain
SELECT
t1
.
a
,
t1
.
a
in
(
select
t2
.
a
from
t2
)
FROM
t1
;
drop
table
t1
,
t2
;
#LIMIT is not supported now
#LIMIT is not supported now
create
table
t
(
a
float
);
create
table
t
1
(
a
float
);
--
error
1235
--
error
1235
select
10.5
IN
(
SELECT
*
from
t
LIMIT
1
);
select
10.5
IN
(
SELECT
*
from
t
1
LIMIT
1
);
--
error
1235
--
error
1235
select
10.5
IN
(
SELECT
*
from
t
LIMIT
1
UNION
SELECT
1.5
);
select
10.5
IN
(
SELECT
*
from
t
1
LIMIT
1
UNION
SELECT
1.5
);
drop
table
t
;
drop
table
t
1
;
create
table
t1
(
a
int
,
b
int
,
c
varchar
(
10
));
create
table
t1
(
a
int
,
b
int
,
c
varchar
(
10
));
create
table
t2
(
a
int
);
create
table
t2
(
a
int
);
...
@@ -517,11 +528,11 @@ UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
...
@@ -517,11 +528,11 @@ UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
drop
table
t1
;
drop
table
t1
;
#test of uncacheable subqueries
#test of uncacheable subqueries
CREATE
TABLE
t
(
a
int
(
1
));
CREATE
TABLE
t
1
(
a
int
(
1
));
EXPLAIN
SELECT
(
SELECT
RAND
()
FROM
t
)
FROM
t
;
EXPLAIN
SELECT
(
SELECT
RAND
()
FROM
t
1
)
FROM
t1
;
EXPLAIN
SELECT
(
SELECT
ENCRYPT
(
'test'
)
FROM
t
)
FROM
t
;
EXPLAIN
SELECT
(
SELECT
ENCRYPT
(
'test'
)
FROM
t
1
)
FROM
t1
;
EXPLAIN
SELECT
(
SELECT
BENCHMARK
(
1
,
1
)
FROM
t
)
FROM
t
;
EXPLAIN
SELECT
(
SELECT
BENCHMARK
(
1
,
1
)
FROM
t
1
)
FROM
t1
;
drop
table
t
;
drop
table
t
1
;
CREATE
TABLE
`t1`
(
CREATE
TABLE
`t1`
(
...
...
sql/item.cc
View file @
48558055
...
@@ -286,7 +286,7 @@ table_map Item_field::used_tables() const
...
@@ -286,7 +286,7 @@ table_map Item_field::used_tables() const
{
{
if
(
field
->
table
->
const_table
)
if
(
field
->
table
->
const_table
)
return
0
;
// const item
return
0
;
// const item
return
(
depended_from
?
RAND_TABLE_BIT
:
field
->
table
->
map
);
return
(
depended_from
?
RAND_TABLE_BIT
:
field
->
table
->
map
);
}
}
Item
*
Item_field
::
get_tmp_table_item
(
THD
*
thd
)
Item
*
Item_field
::
get_tmp_table_item
(
THD
*
thd
)
...
...
sql/item.h
View file @
48558055
...
@@ -102,6 +102,7 @@ public:
...
@@ -102,6 +102,7 @@ public:
virtual
void
save_in_result_field
(
bool
no_conversions
)
{}
virtual
void
save_in_result_field
(
bool
no_conversions
)
{}
virtual
void
no_rows_in_result
()
{}
virtual
void
no_rows_in_result
()
{}
virtual
Item
*
copy_or_same
(
THD
*
thd
)
{
return
this
;
}
virtual
Item
*
copy_or_same
(
THD
*
thd
)
{
return
this
;
}
virtual
Item
*
real_item
()
{
return
this
;
}
virtual
Item
*
get_tmp_table_item
(
THD
*
thd
)
{
return
copy_or_same
(
thd
);
}
virtual
Item
*
get_tmp_table_item
(
THD
*
thd
)
{
return
copy_or_same
(
thd
);
}
virtual
bool
binary
()
const
virtual
bool
binary
()
const
...
@@ -468,9 +469,10 @@ class Item_ref :public Item_ident
...
@@ -468,9 +469,10 @@ class Item_ref :public Item_ident
public:
public:
Field
*
result_field
;
/* Save result here */
Field
*
result_field
;
/* Save result here */
Item
**
ref
;
Item
**
ref
;
Item_ref
(
char
*
db_par
,
char
*
table_name_par
,
char
*
field_name_par
)
Item_ref
(
const
char
*
db_par
,
const
char
*
table_name_par
,
const
char
*
field_name_par
)
:
Item_ident
(
db_par
,
table_name_par
,
field_name_par
),
ref
(
0
)
{}
:
Item_ident
(
db_par
,
table_name_par
,
field_name_par
),
ref
(
0
)
{}
Item_ref
(
Item
**
item
,
c
har
*
table_name_par
,
char
*
field_name_par
)
Item_ref
(
Item
**
item
,
c
onst
char
*
table_name_par
,
const
char
*
field_name_par
)
:
Item_ident
(
NullS
,
table_name_par
,
field_name_par
),
ref
(
item
)
{}
:
Item_ident
(
NullS
,
table_name_par
,
field_name_par
),
ref
(
item
)
{}
// Constructor need to process subselect with temporary tables (see Item)
// Constructor need to process subselect with temporary tables (see Item)
Item_ref
(
THD
*
thd
,
Item_ref
&
item
)
Item_ref
(
THD
*
thd
,
Item_ref
&
item
)
...
@@ -521,6 +523,7 @@ public:
...
@@ -521,6 +523,7 @@ public:
{
{
(
*
ref
)
->
save_in_field
(
result_field
,
no_conversions
);
(
*
ref
)
->
save_in_field
(
result_field
,
no_conversions
);
}
}
Item
*
real_item
()
{
return
*
ref
;
}
};
};
class
Item_in_subselect
;
class
Item_in_subselect
;
...
@@ -530,7 +533,7 @@ protected:
...
@@ -530,7 +533,7 @@ protected:
Item_in_subselect
*
owner
;
Item_in_subselect
*
owner
;
public:
public:
Item_ref_null_helper
(
Item_in_subselect
*
master
,
Item
**
item
,
Item_ref_null_helper
(
Item_in_subselect
*
master
,
Item
**
item
,
c
har
*
table_name_par
,
char
*
field_name_par
)
:
c
onst
char
*
table_name_par
,
const
char
*
field_name_par
)
:
Item_ref
(
item
,
table_name_par
,
field_name_par
),
owner
(
master
)
{}
Item_ref
(
item
,
table_name_par
,
field_name_par
),
owner
(
master
)
{}
double
val
();
double
val
();
longlong
val_int
();
longlong
val_int
();
...
...
sql/item_func.cc
View file @
48558055
...
@@ -120,10 +120,10 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
...
@@ -120,10 +120,10 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
used_tables_cache
|=
(
*
arg
)
->
used_tables
();
used_tables_cache
|=
(
*
arg
)
->
used_tables
();
const_item_cache
&=
(
*
arg
)
->
const_item
();
const_item_cache
&=
(
*
arg
)
->
const_item
();
}
}
if
(
result_type
()
==
STRING_RESULT
)
set_charset
((
*
args
)
->
charset
());
}
}
fix_length_and_dec
();
fix_length_and_dec
();
if
(
result_type
()
==
STRING_RESULT
)
set_charset
((
*
args
)
->
charset
());
fixed
=
1
;
fixed
=
1
;
return
0
;
return
0
;
}
}
...
...
sql/item_row.cc
View file @
48558055
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
*/
*/
Item_row
::
Item_row
(
List
<
Item
>
&
arg
)
:
Item_row
::
Item_row
(
List
<
Item
>
&
arg
)
:
Item
(),
used_tables_cache
(
0
),
array_holder
(
1
),
const_item_cache
(
1
)
Item
(),
used_tables_cache
(
0
),
array_holder
(
1
),
const_item_cache
(
1
)
,
with_null
(
0
)
{
{
//TODO: think placing 2-3 component items in item (as it done for function)
//TODO: think placing 2-3 component items in item (as it done for function)
...
...
sql/item_strfunc.h
View file @
48558055
...
@@ -262,7 +262,7 @@ public:
...
@@ -262,7 +262,7 @@ public:
class
Item_func_old_password
:
public
Item_str_func
class
Item_func_old_password
:
public
Item_str_func
{
{
char
tmp_value
[
1
6
];
/* old password length
*/
char
tmp_value
[
1
7
];
/* old password length +1
*/
public:
public:
Item_func_old_password
(
Item
*
a
)
:
Item_str_func
(
a
)
{}
Item_func_old_password
(
Item
*
a
)
:
Item_str_func
(
a
)
{}
String
*
val_str
(
String
*
);
String
*
val_str
(
String
*
);
...
...
sql/item_subselect.cc
View file @
48558055
...
@@ -489,8 +489,8 @@ void Item_in_subselect::single_value_transformer(THD *thd,
...
@@ -489,8 +489,8 @@ void Item_in_subselect::single_value_transformer(THD *thd,
sl
->
order_list
.
elements
+
sl
->
group_list
.
elements
);
sl
->
order_list
.
elements
+
sl
->
group_list
.
elements
);
item
=
(
*
func
)(
expr
,
new
Item_ref_null_helper
(
this
,
item
=
(
*
func
)(
expr
,
new
Item_ref_null_helper
(
this
,
sl
->
ref_pointer_array
,
sl
->
ref_pointer_array
,
(
char
*
)
"<
no matter
>"
,
(
char
*
)
"<
ref
>"
,
(
char
*
)
"<result>"
));
this
->
full_name
()
));
sl
->
having
=
and_items
(
sl
->
having
,
item
);
sl
->
having
=
and_items
(
sl
->
having
,
item
);
}
}
else
else
...
...
sql/log_event.cc
View file @
48558055
...
@@ -766,7 +766,7 @@ int Query_log_event::write_data(IO_CACHE* file)
...
@@ -766,7 +766,7 @@ int Query_log_event::write_data(IO_CACHE* file)
#ifndef MYSQL_CLIENT
#ifndef MYSQL_CLIENT
Query_log_event
::
Query_log_event
(
THD
*
thd_arg
,
const
char
*
query_arg
,
Query_log_event
::
Query_log_event
(
THD
*
thd_arg
,
const
char
*
query_arg
,
ulong
query_length
,
bool
using_trans
)
ulong
query_length
,
bool
using_trans
)
:
Log_event
(
thd_arg
,
!
thd_arg
->
lex
.
tmp_table_used
?
:
Log_event
(
thd_arg
,
!
thd_arg
->
tmp_table_used
?
0
:
LOG_EVENT_THREAD_SPECIFIC_F
,
using_trans
),
0
:
LOG_EVENT_THREAD_SPECIFIC_F
,
using_trans
),
data_buf
(
0
),
query
(
query_arg
),
data_buf
(
0
),
query
(
query_arg
),
db
(
thd_arg
->
db
),
q_len
((
uint32
)
query_length
),
db
(
thd_arg
->
db
),
q_len
((
uint32
)
query_length
),
...
...
sql/sql_base.cc
View file @
48558055
...
@@ -792,7 +792,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
...
@@ -792,7 +792,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
table
->
query_id
=
thd
->
query_id
;
table
->
query_id
=
thd
->
query_id
;
thd
->
lex
.
tmp_table_used
=
1
;
thd
->
tmp_table_used
=
1
;
goto
reset
;
goto
reset
;
}
}
}
}
...
...
sql/sql_class.cc
View file @
48558055
...
@@ -87,7 +87,7 @@ THD::THD():user_time(0), is_fatal_error(0),
...
@@ -87,7 +87,7 @@ THD::THD():user_time(0), is_fatal_error(0),
locked
=
killed
=
count_cuted_fields
=
some_tables_deleted
=
no_errors
=
password
=
locked
=
killed
=
count_cuted_fields
=
some_tables_deleted
=
no_errors
=
password
=
query_start_used
=
prepare_command
=
0
;
query_start_used
=
prepare_command
=
0
;
db_length
=
query_length
=
col_access
=
0
;
db_length
=
query_length
=
col_access
=
0
;
query_error
=
0
;
query_error
=
tmp_table_used
=
0
;
next_insert_id
=
last_insert_id
=
0
;
next_insert_id
=
last_insert_id
=
0
;
open_tables
=
temporary_tables
=
handler_tables
=
derived_tables
=
0
;
open_tables
=
temporary_tables
=
handler_tables
=
derived_tables
=
0
;
current_tablenr
=
0
;
current_tablenr
=
0
;
...
...
sql/sql_class.h
View file @
48558055
...
@@ -550,6 +550,7 @@ public:
...
@@ -550,6 +550,7 @@ public:
bool
query_error
,
bootstrap
,
cleanup_done
;
bool
query_error
,
bootstrap
,
cleanup_done
;
bool
volatile
killed
;
bool
volatile
killed
;
bool
prepare_command
;
bool
prepare_command
;
bool
tmp_table_used
;
/*
/*
If we do a purge of binary logs, log index info of the threads
If we do a purge of binary logs, log index info of the threads
...
...
sql/sql_lex.cc
View file @
48558055
...
@@ -167,7 +167,6 @@ LEX *lex_start(THD *thd, uchar *buf,uint length)
...
@@ -167,7 +167,6 @@ LEX *lex_start(THD *thd, uchar *buf,uint length)
lex
->
slave_thd_opt
=
0
;
lex
->
slave_thd_opt
=
0
;
lex
->
sql_command
=
SQLCOM_END
;
lex
->
sql_command
=
SQLCOM_END
;
lex
->
safe_to_cache_query
=
1
;
lex
->
safe_to_cache_query
=
1
;
lex
->
tmp_table_used
=
0
;
bzero
(
&
lex
->
mi
,
sizeof
(
lex
->
mi
));
bzero
(
&
lex
->
mi
,
sizeof
(
lex
->
mi
));
return
lex
;
return
lex
;
}
}
...
@@ -1051,7 +1050,6 @@ void st_select_lex::init_select()
...
@@ -1051,7 +1050,6 @@ void st_select_lex::init_select()
use_index
.
empty
();
use_index
.
empty
();
ftfunc_list_alloc
.
empty
();
ftfunc_list_alloc
.
empty
();
ftfunc_list
=
&
ftfunc_list_alloc
;
ftfunc_list
=
&
ftfunc_list_alloc
;
if
(
linkage
!=
UNION_TYPE
)
linkage
=
UNSPECIFIED_TYPE
;
linkage
=
UNSPECIFIED_TYPE
;
}
}
...
...
sql/sql_lex.h
View file @
48558055
...
@@ -221,9 +221,11 @@ public:
...
@@ -221,9 +221,11 @@ public:
static
void
*
operator
new
(
size_t
size
)
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_calloc
((
uint
)
size
);
}
}
static
void
operator
delete
(
void
*
ptr
,
size_t
size
)
{}
static
void
operator
delete
(
void
*
ptr
,
size_t
size
)
{}
st_select_lex_node
()
{}
virtual
~
st_select_lex_node
()
{}
virtual
~
st_select_lex_node
()
{}
inline
st_select_lex_node
*
get_master
()
{
return
master
;
}
inline
st_select_lex_node
*
get_master
()
{
return
master
;
}
virtual
void
init_query
();
virtual
void
init_query
();
...
@@ -475,7 +477,6 @@ typedef struct st_lex
...
@@ -475,7 +477,6 @@ typedef struct st_lex
uint
slave_thd_opt
;
uint
slave_thd_opt
;
CHARSET_INFO
*
charset
;
CHARSET_INFO
*
charset
;
char
*
help_arg
;
char
*
help_arg
;
bool
tmp_table_used
;
inline
void
uncacheable
()
inline
void
uncacheable
()
{
{
...
...
sql/sql_parse.cc
View file @
48558055
...
@@ -3181,6 +3181,7 @@ mysql_init_query(THD *thd)
...
@@ -3181,6 +3181,7 @@ mysql_init_query(THD *thd)
thd
->
sent_row_count
=
thd
->
examined_row_count
=
0
;
thd
->
sent_row_count
=
thd
->
examined_row_count
=
0
;
thd
->
is_fatal_error
=
thd
->
rand_used
=
0
;
thd
->
is_fatal_error
=
thd
->
rand_used
=
0
;
thd
->
server_status
&=
~
SERVER_MORE_RESULTS_EXISTS
;
thd
->
server_status
&=
~
SERVER_MORE_RESULTS_EXISTS
;
thd
->
tmp_table_used
=
0
;
if
(
opt_bin_log
)
if
(
opt_bin_log
)
reset_dynamic
(
&
thd
->
user_var_events
);
reset_dynamic
(
&
thd
->
user_var_events
);
...
...
sql/sql_select.cc
View file @
48558055
...
@@ -1902,9 +1902,10 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
...
@@ -1902,9 +1902,10 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
case
Item_func
:
:
OPTIMIZE_NONE
:
case
Item_func
:
:
OPTIMIZE_NONE
:
break
;
break
;
case
Item_func
:
:
OPTIMIZE_KEY
:
case
Item_func
:
:
OPTIMIZE_KEY
:
if
(
cond_func
->
key_item
()
->
type
()
==
Item
::
FIELD_ITEM
)
if
(
cond_func
->
key_item
()
->
real_item
()
->
type
()
==
Item
::
FIELD_ITEM
)
add_key_field
(
key_fields
,
*
and_level
,
add_key_field
(
key_fields
,
*
and_level
,
((
Item_field
*
)
(
cond_func
->
key_item
()))
->
field
,
((
Item_field
*
)
(
cond_func
->
key_item
()
->
real_item
()))
->
field
,
0
,(
Item
*
)
0
,
usable_tables
);
0
,(
Item
*
)
0
,
usable_tables
);
break
;
break
;
case
Item_func
:
:
OPTIMIZE_OP
:
case
Item_func
:
:
OPTIMIZE_OP
:
...
@@ -1912,18 +1913,20 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
...
@@ -1912,18 +1913,20 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
bool
equal_func
=
(
cond_func
->
functype
()
==
Item_func
::
EQ_FUNC
||
bool
equal_func
=
(
cond_func
->
functype
()
==
Item_func
::
EQ_FUNC
||
cond_func
->
functype
()
==
Item_func
::
EQUAL_FUNC
);
cond_func
->
functype
()
==
Item_func
::
EQUAL_FUNC
);
if
(
cond_func
->
arguments
()[
0
]
->
type
()
==
Item
::
FIELD_ITEM
)
if
(
cond_func
->
arguments
()[
0
]
->
real_item
()
->
type
()
==
Item
::
FIELD_ITEM
)
{
{
add_key_field
(
key_fields
,
*
and_level
,
add_key_field
(
key_fields
,
*
and_level
,
((
Item_field
*
)
(
cond_func
->
arguments
()[
0
]))
->
field
,
((
Item_field
*
)
(
cond_func
->
arguments
()[
0
])
->
real_item
())
->
field
,
equal_func
,
equal_func
,
(
cond_func
->
arguments
()[
1
]),
usable_tables
);
(
cond_func
->
arguments
()[
1
]),
usable_tables
);
}
}
if
(
cond_func
->
arguments
()[
1
]
->
type
()
==
Item
::
FIELD_ITEM
&&
if
(
cond_func
->
arguments
()[
1
]
->
real_item
()
->
type
()
==
Item
::
FIELD_ITEM
&&
cond_func
->
functype
()
!=
Item_func
::
LIKE_FUNC
)
cond_func
->
functype
()
!=
Item_func
::
LIKE_FUNC
)
{
{
add_key_field
(
key_fields
,
*
and_level
,
add_key_field
(
key_fields
,
*
and_level
,
((
Item_field
*
)
(
cond_func
->
arguments
()[
1
]))
->
field
,
((
Item_field
*
)
(
cond_func
->
arguments
()[
1
])
->
real_item
())
->
field
,
equal_func
,
equal_func
,
(
cond_func
->
arguments
()[
0
]),
usable_tables
);
(
cond_func
->
arguments
()[
0
]),
usable_tables
);
}
}
...
@@ -1931,10 +1934,11 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
...
@@ -1931,10 +1934,11 @@ add_key_fields(JOIN_TAB *stat,KEY_FIELD **key_fields,uint *and_level,
}
}
case
Item_func
:
:
OPTIMIZE_NULL
:
case
Item_func
:
:
OPTIMIZE_NULL
:
/* column_name IS [NOT] NULL */
/* column_name IS [NOT] NULL */
if
(
cond_func
->
arguments
()[
0
]
->
type
()
==
Item
::
FIELD_ITEM
)
if
(
cond_func
->
arguments
()[
0
]
->
real_item
()
->
type
()
==
Item
::
FIELD_ITEM
)
{
{
add_key_field
(
key_fields
,
*
and_level
,
add_key_field
(
key_fields
,
*
and_level
,
((
Item_field
*
)
(
cond_func
->
arguments
()[
0
]))
->
field
,
((
Item_field
*
)
(
cond_func
->
arguments
()[
0
])
->
real_item
())
->
field
,
cond_func
->
functype
()
==
Item_func
::
ISNULL_FUNC
,
cond_func
->
functype
()
==
Item_func
::
ISNULL_FUNC
,
new
Item_null
,
usable_tables
);
new
Item_null
,
usable_tables
);
}
}
...
...
sql/sql_table.cc
View file @
48558055
...
@@ -250,7 +250,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
...
@@ -250,7 +250,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
wrong_tables
.
append
(
String
(
table
->
real_name
,
default_charset_info
));
wrong_tables
.
append
(
String
(
table
->
real_name
,
default_charset_info
));
}
}
}
}
thd
->
lex
.
tmp_table_used
=
tmp_table_deleted
;
thd
->
tmp_table_used
=
tmp_table_deleted
;
if
(
some_tables_deleted
||
tmp_table_deleted
)
if
(
some_tables_deleted
||
tmp_table_deleted
)
{
{
query_cache_invalidate3
(
thd
,
tables
,
0
);
query_cache_invalidate3
(
thd
,
tables
,
0
);
...
@@ -885,7 +885,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
...
@@ -885,7 +885,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
(
void
)
rm_temporary_table
(
create_info
->
db_type
,
path
);
(
void
)
rm_temporary_table
(
create_info
->
db_type
,
path
);
goto
end
;
goto
end
;
}
}
thd
->
lex
.
tmp_table_used
=
1
;
thd
->
tmp_table_used
=
1
;
}
}
if
(
!
tmp_table
&&
!
no_log
)
if
(
!
tmp_table
&&
!
no_log
)
{
{
...
...
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
