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

Merge with 4.0 to get fix for MIN/MAX

Browse Source 
BitKeeper/etc/ignore:
  added support-files/MacOSX/Info.plist
Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
configure.in:
  Use local version
mysql-test/r/func_group.result:
  merge
mysql-test/r/order_by.result:
  merge
mysql-test/r/show_check.result:
  merge
mysql-test/t/func_group.test:
  merge
mysql-test/t/join.test:
  merge
sql/mysql_priv.h:
  Use local version
sql/sql_yacc.yy:
  merge
sql/table.cc:
  USe local
This commit is contained in:
unknown
2003-02-07 16:38:37 +02:00
parent d66e60248c f06b0d9f3c
commit e751d29836
48 changed files with 533 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/opt_range.cc
View File

@ -2564,8 +2564,7 @@ QUICK_SELECT_DESC::QUICK_SELECT_DESC(QUICK_SELECT *q, uint used_key_parts)
for (r = it++; r; r = it++)
{
rev_ranges.push_front(r);
if (not_read_after_key && range_reads_after_key(r) ||
test_if_null_range(r,used_key_parts))
if (not_read_after_key && range_reads_after_key(r))
{
it.rewind(); // Reset range
error = HA_ERR_UNSUPPORTED;
@ -2734,6 +2733,7 @@ bool QUICK_SELECT_DESC::range_reads_after_key(QUICK_RANGE *range_arg)
/* True if we are reading over a key that may have a NULL value */
#ifdef NOT_USED
bool QUICK_SELECT_DESC::test_if_null_range(QUICK_RANGE *range_arg,
uint used_key_parts)
{
@ -2779,6 +2779,7 @@ bool QUICK_SELECT_DESC::test_if_null_range(QUICK_RANGE *range_arg,
return 1; // Covers null part
return 0;
}
#endif
/*****************************************************************************