Commit a6abd60c authored by unknown's avatar unknown

Merge mysql.com:/home/timka/mysql/src/5.0-virgin

into mysql.com:/home/timka/mysql/src/5.0-bug-8576

parents 0d8ec8d5 7a8a7607
...@@ -7467,7 +7467,7 @@ void cost_group_min_max(TABLE* table, KEY *index_info, uint used_key_parts, ...@@ -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() ...@@ -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");
......
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