mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/timka/mysql/src/5.0-grind
This commit is contained in:
timour@mysql.com 2004-11-18 11:24:51 +02:00
commit 57bdbd4e78
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.bzrignore
View file

@ -960,3 +960,4 @@ vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
ac_available_languages_fragment
ndb/tools/ndb_restore

3
sql/item.cc
View file

@ -1722,7 +1722,10 @@ resolve_ref_in_select_and_group(THD *thd, Item_ident *ref, SELECT_LEX *select)
else if (group_by_ref)
return group_by_ref;
else
{
DBUG_ASSERT(FALSE);
return NULL; /* So there is no compiler warning. */
}
}
else
return (Item**) not_found_item;

4
sql/opt_range.cc
View file

@ -8066,7 +8066,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
boundary of cur_range, there is no need to check this range.
*/
if (range_idx != 0 && !(cur_range->flag & NO_MAX_RANGE) &&
(key_cmp(min_max_arg_part, (byte*) cur_range->max_key,
(key_cmp(min_max_arg_part, (const byte*) cur_range->max_key,
min_max_arg_len) == 1))
continue;
@ -8193,7 +8193,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
*/
if (range_idx != min_max_ranges.elements &&
!(cur_range->flag & NO_MIN_RANGE) &&
(key_cmp(min_max_arg_part, (byte*) cur_range->min_key,
(key_cmp(min_max_arg_part, (const byte*) cur_range->min_key,
min_max_arg_len) == -1))
continue;