diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-23 20:05:54 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-23 20:05:54 +0300 |
| commit | 68524c81feac77d7d0e8dca716738b5b59d98e3f (patch) | |
| tree | 4786009a4571cb9c2f78de142df7098da40097c8 /sql/sql_select.cc | |
| parent | 35c2b9df7564c95c38f04fc4dbc3bebea81a9a41 (diff) | |
| download | mariadb-git-68524c81feac77d7d0e8dca716738b5b59d98e3f.tar.gz | |
Simple code cleanup
mysql-test/r/innodb.result:
Fixed test case after innodb optimize->analyze fix
mysys/mf_pack.c:
Added comments
sql/log_event.cc:
Fixed usage of fn_format()
sql/slave.cc:
Indentation fixes and comments cleanup
sql/sql_repl.cc:
Comment cleanup
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0e8b191e4ef..67bec77e245 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1627,6 +1627,9 @@ add_key_part(DYNAMIC_ARRAY *keyuse_array,KEY_FIELD *key_field) key_field->field->table->reginfo.not_exists_optimize=1; } + +#define FT_KEYPART (MAX_REF_PARTS+10) + static void add_ft_keys(DYNAMIC_ARRAY *keyuse_array, JOIN_TAB *stat,COND *cond,table_map usable_tables) @@ -1685,23 +1688,20 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array, } } - if (!cond_func || cond_func->key == NO_SUCH_KEY) - return; - - if (!(usable_tables & cond_func->table->map)) + if ((!cond_func || cond_func->key == NO_SUCH_KEY) || + (!(usable_tables & cond_func->table->map))) return; KEYUSE keyuse; - keyuse.table= cond_func->table; keyuse.val = cond_func; keyuse.key = cond_func->key; -#define FT_KEYPART (MAX_REF_PARTS+10) - keyuse.keypart=FT_KEYPART; + keyuse.keypart= FT_KEYPART; keyuse.used_tables=cond_func->key_item()->used_tables(); VOID(insert_dynamic(keyuse_array,(gptr) &keyuse)); } + static int sort_keyuse(KEYUSE *a,KEYUSE *b) { |