mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-8576
This commit is contained in:
commit
cb44ad44e3
1 changed files with 9 additions and 1 deletions
|
|
@ -7467,7 +7467,7 @@ void cost_group_min_max(TABLE* table, KEY *index_info, uint used_key_parts,
|
||||||
double quick_prefix_selectivity;
|
double quick_prefix_selectivity;
|
||||||
double io_cost;
|
double io_cost;
|
||||||
double cpu_cost= 0; /* TODO: CPU cost of index_read calls? */
|
double cpu_cost= 0; /* TODO: CPU cost of index_read calls? */
|
||||||
DBUG_ENTER("TRP_GROUP_MIN_MAX::cost");
|
DBUG_ENTER("cost_group_min_max");
|
||||||
|
|
||||||
table_records= table->file->records;
|
table_records= table->file->records;
|
||||||
keys_per_block= (table->file->block_size / 2 /
|
keys_per_block= (table->file->block_size / 2 /
|
||||||
|
|
@ -7971,7 +7971,15 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next()
|
||||||
{
|
{
|
||||||
int min_res= 0;
|
int min_res= 0;
|
||||||
int max_res= 0;
|
int max_res= 0;
|
||||||
|
#ifdef HPUX11
|
||||||
|
/*
|
||||||
|
volatile is required by a bug in the HP compiler due to which the
|
||||||
|
last test of result fails.
|
||||||
|
*/
|
||||||
|
volatile int result;
|
||||||
|
#else
|
||||||
int result;
|
int result;
|
||||||
|
#endif
|
||||||
int is_last_prefix;
|
int is_last_prefix;
|
||||||
|
|
||||||
DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::get_next");
|
DBUG_ENTER("QUICK_GROUP_MIN_MAX_SELECT::get_next");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue