diff options
| author | unknown <thek@kpdesk.mysql.com> | 2008-04-14 12:58:53 +0200 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2008-04-14 12:58:53 +0200 |
| commit | 7378628456033fa7406be8699a0e1e0c7bbda3da (patch) | |
| tree | 5a0c042d9ace20eab8942b19314ec930c62a10a5 /sql/opt_range.cc | |
| parent | c481f6b3cf80f471321d2ef4e7c68fe9e6e5d0ca (diff) | |
| parent | f149152f9778ba529c8999ed1175321b1ecbea88 (diff) | |
| download | mariadb-git-7378628456033fa7406be8699a0e1e0c7bbda3da.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
mysql-test/r/grant.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
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 e5709f418f7..b428909d9b7 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2314,9 +2314,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, table deletes. */ if ((thd->lex->sql_command != SQLCOM_DELETE)) -#ifdef NOT_USED - if ((thd->lex->sql_command != SQLCOM_UPDATE)) -#endif { /* Get best non-covering ROR-intersection plan and prepare data for |