diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-10-04 23:33:55 +0300 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-10-04 23:33:55 +0300 |
| commit | 2011f790295f05ef8fde08b37dc00aa11d7a305c (patch) | |
| tree | 7225ad3217657fb9d0f7fb08e76438910a7c2b69 /sql/opt_range.cc | |
| parent | 4eb383e06c021e89244cbf7d24abecb7b3bde01b (diff) | |
| parent | 24db7ed7e13c603488c0a5e05ad9c87754b2ffaf (diff) | |
| download | mariadb-git-2011f790295f05ef8fde08b37dc00aa11d7a305c.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.prod
BUILD/SETUP.sh:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_delete.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_update.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/ma_pagecache.c:
Manual merge with maria tree.
storage/myisam/sort.c:
Manual merge with maria tree.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index be38f0406da..97d0bcc8707 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2139,9 +2139,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, quick=0; needed_reg.clear_all(); quick_keys.clear_all(); - if ((specialflag & SPECIAL_SAFE_MODE) && ! force_quick_range || - !limit) - DBUG_RETURN(0); /* purecov: inspected */ if (keys_to_use.is_clear_all()) DBUG_RETURN(0); records= head->file->stats.records; |