database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Post-merge fixes.

Browse Source
This commit is contained in:
pem@mysql.comhem.se
2004-06-07 12:08:13 +02:00
parent 3dcd7e53af
commit 12b65b31b8
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/index_merge.result
View File

@ -280,6 +280,7 @@ union select * from t1 where key1<4 or key3=5;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 index_merge i1,i2 i1,i2 4,4 NULL 2 Using where 1 PRIMARY t1 index_merge i1,i2 i1,i2 4,4 NULL 2 Using where
2 UNION t1 index_merge i1,i3 i1,i3 4,4 NULL 5 Using where 2 UNION t1 index_merge i1,i3 i1,i3 4,4 NULL 5 Using where
NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL
explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5; explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY <derived2> system NULL NULL NULL NULL 1 1 PRIMARY <derived2> system NULL NULL NULL NULL 1

5
sql/opt_range.cc
View File

@ -646,6 +646,7 @@ QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
{ {
index= key_nr; index= key_nr;
head= table; head= table;
key_part_info= head->key_info[index].key_part;
my_init_dynamic_array(&ranges, sizeof(QUICK_RANGE*), 16, 16); my_init_dynamic_array(&ranges, sizeof(QUICK_RANGE*), 16, 16);
if (!no_alloc && !parent_alloc) if (!no_alloc && !parent_alloc)
@ -662,8 +663,8 @@ QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
int QUICK_RANGE_SELECT::init() int QUICK_RANGE_SELECT::init()
{ {
key_part_info= head->key_info[index].key_part; DBUG_ENTER("QUICK_RANGE_SELECT::init");
return (error= file->index_init(index)); DBUG_RETURN(error= file->index_init(index));
} }
QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT() QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()

1
sql/sql_select.cc
View File

@ -10450,6 +10450,7 @@ int mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit, select_result *result)
else else
{ {
thd->lex->current_select= first; thd->lex->current_select= first;
unit->set_limit(unit->global_parameters, first);
res= mysql_select(thd, &first->ref_pointer_array, res= mysql_select(thd, &first->ref_pointer_array,
(TABLE_LIST*) first->table_list.first, (TABLE_LIST*) first->table_list.first,
first->with_wild, first->item_list, first->with_wild, first->item_list,