diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
| commit | d042146e5b41b6222df3e6b4c16a44f3ef2939b7 (patch) | |
| tree | e40f5b435f7d17ed1c24dfb787ab8cd5f4f7d5d8 /sql/opt_table_elimination.cc | |
| parent | 3e610bc58d0ba325fdca3b06dfa976ecc513dc1e (diff) | |
| parent | f0f21036951f6fed2fddeb58375425f957751fd5 (diff) | |
| download | mariadb-git-d042146e5b41b6222df3e6b4c16a44f3ef2939b7.tar.gz | |
Merge with MariaDB 5.1.49
Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
Diffstat (limited to 'sql/opt_table_elimination.cc')
| -rw-r--r-- | sql/opt_table_elimination.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_table_elimination.cc b/sql/opt_table_elimination.cc index 5d952021365..174dcbf9c13 100644 --- a/sql/opt_table_elimination.cc +++ b/sql/opt_table_elimination.cc @@ -1539,7 +1539,7 @@ Dep_value_table *Dep_analysis_context::create_table_value(TABLE *table) for (uint i=0; i < table->s->keys; i++) { KEY *key= table->key_info + i; - if ((key->flags & (HA_NOSAME | HA_END_SPACE_KEY)) == HA_NOSAME) + if (key->flags & HA_NOSAME) { Dep_module_key *key_dep; if (!(key_dep= new Dep_module_key(tbl_dep, i, key->key_parts))) |