diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-12-11 12:50:39 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-12-11 12:50:39 -0800 |
| commit | 419d524ff9013534d522eca8fedee3ead2c403d5 (patch) | |
| tree | bef532757e31374bdd44f311f2a81ee9b652753d | |
| parent | 7f52af655a04c4fecfe32bede79bd65cac0e043d (diff) | |
| download | mariadb-git-419d524ff9013534d522eca8fedee3ead2c403d5.tar.gz | |
Fixed compiler warnings.
| -rw-r--r-- | sql/sql_join_cache.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 713d6f9e93f..c0e68c6090f 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -2450,7 +2450,7 @@ void JOIN_CACHE::print_explain_comment(String *str) str->append(buffer_type); str->append(STRING_WITH_LEN(", ")); - const char *join_alg; + const char *join_alg=""; switch (get_join_alg()) { case BNL_JOIN_ALG: join_alg= "BNL"; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f53ffb7f893..2228d725c98 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7843,7 +7843,7 @@ static bool make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after) { uint i; - uint jcl; + uint jcl= 0; bool statistics= test(!(join->select_options & SELECT_DESCRIBE)); bool sorted= 1; uint first_sjm_table= MAX_TABLES; @@ -7862,8 +7862,8 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after) { JOIN_TAB *tab=join->join_tab+i; TABLE *table=tab->table; - bool icp_other_tables_ok; - bool idx_cond_fact_out; + bool icp_other_tables_ok= FALSE; + bool idx_cond_fact_out= FALSE; tab->read_record.table= table; tab->read_record.file=table->file; tab->read_record.unlock_row= rr_unlock_row; |