diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-02-27 09:35:14 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-02-27 09:35:14 -0800 |
| commit | ed3524c212a31bb087ba7cbaf93b6ed404efb0de (patch) | |
| tree | fc80e538267fad7c8dad3839213867f91c4f28ed | |
| parent | bbd4bb310d7b500a57be56b8f0501fa8eee6d40f (diff) | |
| download | mariadb-git-ed3524c212a31bb087ba7cbaf93b6ed404efb0de.tar.gz | |
Minor corrections.
sql/mysqld.cc:
Fixed: optimize_join_buffer_size was missing in the description of possible
options for the optimizer switch.
sql/sql_select.cc:
Fixed: initialization for the field ref_table_rows of the KEYUSE structure was
missing (as a result of a lame merge).
| -rw-r--r-- | sql/mysqld.cc | 3 | ||||
| -rw-r--r-- | sql/sql_select.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7bd16724d22..06efc9445eb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7413,7 +7413,8 @@ thread is in the relay logs.", "index_condition_pushdown, firstmatch, loosescan, materialization, " "semijoin, partial_match_rowid_merge, partial_match_table_scan, " "subquery_cache, outer_join_with_cache, semijoin_with_cache, " - "join_cache_incremental, join_cache_hashed, join_cache_bka" + "join_cache_incremental, join_cache_hashed, join_cache_bka, " + "optimize_join_buffer_size" #ifndef DBUG_OFF ", table_elimination" #endif diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 616b17255bc..5490a7f0cab 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4031,6 +4031,7 @@ add_keyuse(DYNAMIC_ARRAY *keyuse_array, KEY_FIELD *key_field, } keyuse.used_tables= key_field->val->used_tables(); keyuse.optimize= key_field->optimize & KEY_OPTIMIZE_REF_OR_NULL; + keyuse.ref_table_rows= 0; keyuse.null_rejecting= key_field->null_rejecting; keyuse.cond_guard= key_field->cond_guard; keyuse.sj_pred_no= key_field->sj_pred_no; |