Commit 9112cdf5 authored by unknown's avatar unknown

Fixex for some crashing bug


mysql-test/r/analyse.result:
  A fix for some crashing bug
mysql-test/r/handler.result:
  A fix for some crashing bug
mysql-test/t/analyse.test:
  A fix for some crashing bug
mysql-test/t/handler.test:
  A fix for some crashing bug
sql/sql_select.cc:
  A fix for some crashing bug
parent e6b5a8a7
drop table if exists t1,t2; drop table if exists t1,t2;
create table t1 (i int, j int); create table t1 (i int, j int);
insert into t1 values (1,2), (3,4), (5,6), (7,8); insert into t1 values (1,2), (3,4), (5,6), (7,8);
select count(*) from t1 procedure analyse();
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
-6510615555426900571 -6510615555426900571 -6510615555426900571 -6510615555426900571
select * from t1 procedure analyse(); select * from t1 procedure analyse();
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL
......
...@@ -5,6 +5,8 @@ insert into t1 values ...@@ -5,6 +5,8 @@ insert into t1 values
(14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii"); (20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open as t2; handler t1 open as t2;
handler t2 read a=(SELECT 1);
You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1
handler t2 read a first; handler t2 read a first;
a b a b
14 aaa 14 aaa
......
...@@ -7,6 +7,7 @@ drop table if exists t1,t2; ...@@ -7,6 +7,7 @@ drop table if exists t1,t2;
--enable_warnings --enable_warnings
create table t1 (i int, j int); create table t1 (i int, j int);
insert into t1 values (1,2), (3,4), (5,6), (7,8); insert into t1 values (1,2), (3,4), (5,6), (7,8);
select count(*) from t1 procedure analyse();
select * from t1 procedure analyse(); select * from t1 procedure analyse();
create table t2 select * from t1 procedure analyse(); create table t2 select * from t1 procedure analyse();
select * from t2; select * from t2;
......
...@@ -12,6 +12,8 @@ insert into t1 values ...@@ -12,6 +12,8 @@ insert into t1 values
(14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii"); (20,"ggg"),(21,"hhh"),(22,"iii");
handler t1 open as t2; handler t1 open as t2;
-- error 1064
handler t2 read a=(SELECT 1);
handler t2 read a first; handler t2 read a first;
handler t2 read a next; handler t2 read a next;
handler t2 read a next; handler t2 read a next;
......
...@@ -715,6 +715,13 @@ JOIN::exec() ...@@ -715,6 +715,13 @@ JOIN::exec()
DBUG_ENTER("JOIN::exec"); DBUG_ENTER("JOIN::exec");
if (procedure)
{
if (procedure->change_columns(fields_list) ||
result->prepare(fields_list, unit))
DBUG_VOID_RETURN;
}
if (!tables_list) if (!tables_list)
{ // Only test of functions { // Only test of functions
error=0; error=0;
...@@ -768,8 +775,6 @@ JOIN::exec() ...@@ -768,8 +775,6 @@ JOIN::exec()
test_if_skip_sort_order(&join_tab[const_tables], order, test_if_skip_sort_order(&join_tab[const_tables], order,
select_limit, 0)))) select_limit, 0))))
order=0; order=0;
if (procedure)
(void)result->prepare(fields_list, unit);
select_describe(this, need_tmp, select_describe(this, need_tmp,
order != 0 && !skip_sort_order, order != 0 && !skip_sort_order,
select_distinct); select_distinct);
...@@ -989,9 +994,6 @@ JOIN::exec() ...@@ -989,9 +994,6 @@ JOIN::exec()
} }
if (procedure) if (procedure)
{ {
if (procedure->change_columns(fields_list) ||
result->prepare(fields_list, unit))
DBUG_VOID_RETURN;
count_field_types(&tmp_table_param, all_fields, 0); count_field_types(&tmp_table_param, all_fields, 0);
} }
if (group || tmp_table_param.sum_func_count || if (group || tmp_table_param.sum_func_count ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment