diff options
| author | unknown <jani@linux.local> | 2003-12-17 19:18:01 +0000 |
|---|---|---|
| committer | unknown <jani@linux.local> | 2003-12-17 19:18:01 +0000 |
| commit | 1ca25d0e02876cc48f176195840a8dbbc4b4b0e9 (patch) | |
| tree | 9624bcfb82e61d1139c19a3a6b0673732b426703 | |
| parent | fd4544879b91fec027909f3607fe9fa68a214241 (diff) | |
| download | mariadb-git-1ca25d0e02876cc48f176195840a8dbbc4b4b0e9.tar.gz | |
Fixed some minor issues, revealed by compiler warnings when using
BUILD/compile-pentium-debug-max
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/item_func.cc | 5 | ||||
| -rw-r--r-- | sql/opt_range.cc | 1 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 11 |
4 files changed, 15 insertions, 3 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c63a1237bbd..72825baa766 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -49,6 +49,7 @@ jani@dsl-kpogw4gb5.dial.inet.fi jani@hynda.(none) jani@hynda.mysql.fi jani@janikt.pp.saunalahti.fi +jani@linux.local jani@rhols221.adsl.netsonic.fi jani@rhols221.arenanet.fi jani@ua126d19.elisa.omakaista.fi diff --git a/sql/item_func.cc b/sql/item_func.cc index 442e5c53675..01a5f1cdf3c 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3144,6 +3144,11 @@ Item_func_sp::fix_length_and_dec() decimals= 0; max_length= 21; break; + case ROW_RESULT: + default: + // This case should never be choosen + DBUG_ASSERT(0); + break; } } DBUG_VOID_RETURN; diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 93ba77f04ae..53a1c822b2f 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1014,6 +1014,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, SEL_IMERGE *min_imerge= NULL; double min_imerge_cost= DBL_MAX; ha_rows min_imerge_records; + LINT_INIT(min_imerge_records); // Protected by min_imerge List_iterator_fast<SEL_IMERGE> it(tree->merges); while ((imerge= it++)) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 67afc355153..1de86f486b4 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1140,7 +1140,9 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) /* request for new delayed insert */ if (!(thd->lock=mysql_lock_tables(thd,&di->table,1))) { - di->dead=thd->killed= THD::KILL_CONNECTION; // Fatal error + /* Fatal error */ + di->dead= 1; + thd->killed= THD::KILL_CONNECTION; } pthread_cond_broadcast(&di->cond_client); } @@ -1148,7 +1150,9 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) { if (di->handle_inserts()) { - di->dead=thd->killed=THD::KILL_CONNECTION; // Some fatal error + /* Some fatal error */ + di->dead= 1; + thd->killed= THD::KILL_CONNECTION; } } di->status=0; @@ -1175,7 +1179,8 @@ end: close_thread_tables(thd); // Free the table di->table=0; - di->dead=thd->killed= THD::KILL_CONNECTION; // If error + di->dead= 1; // If error + thd->killed= THD::KILL_CONNECTION; // If error pthread_cond_broadcast(&di->cond_client); // Safety pthread_mutex_unlock(&di->mutex); |