diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-07 15:06:23 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-07 15:06:23 +0200 |
| commit | 8602b726a1d85aa0300d08dfea4ad8002fee9070 (patch) | |
| tree | 5cace589571553163ae26ddaaf6402dfe33ea6ac /sql/opt_range.cc | |
| parent | db4f836be2ba117f8e588634a7852101bc8eec13 (diff) | |
| parent | def31a51354b28e288b7b52a58c891183bfde855 (diff) | |
| download | mariadb-git-8602b726a1d85aa0300d08dfea4ad8002fee9070.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index c607e71c01b..768344ab702 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2555,8 +2555,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; @@ -2717,6 +2716,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) { @@ -2762,6 +2762,7 @@ bool QUICK_SELECT_DESC::test_if_null_range(QUICK_RANGE *range_arg, return 1; // Covers null part return 0; } +#endif /***************************************************************************** |