From e03f8ef25aa521dd698f185d4500e5eaab5766cb Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Jun 2006 02:49:19 +0300 Subject: Remove compiler warnings Fixed wrong table flags type in ndbcluster that caused previous commit to fail client/mysqltest.c: Portability fix mysys/my_bitmap.c: Remove compiler warning mysys/my_handler.c: Remove compiler warning mysys/thr_lock.c: Remove compiler warning plugin/fulltext/plugin_example.c: Remove compiler warning sql/ha_ndbcluster.h: Fixed wrong of handler flags (caused previous commit to fail) sql/ha_ndbcluster_binlog.cc: Remove compiler warning sql/handler.cc: Indentation cleanups sql/mysql_priv.h: Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines) sql/mysqld.cc: Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines) Split initialization of variables of different types to remove compiler warning sql/set_var.cc: Fixed indentation sql/set_var.h: sys_var_log_output now takes a pointer to ulong storage/archive/archive_test.c: Remove compiler warning --- mysys/thr_lock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mysys/thr_lock.c') diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index b4de57229bf..74d6f7431a8 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -1123,10 +1123,12 @@ void thr_downgrade_write_lock(THR_LOCK_DATA *in_data, enum thr_lock_type new_lock_type) { THR_LOCK *lock=in_data->lock; - THR_LOCK_DATA *data, *next; enum thr_lock_type old_lock_type= in_data->type; +#ifdef TO_BE_REMOVED + THR_LOCK_DATA *data, *next; bool start_writers= FALSE; bool start_readers= FALSE; +#endif DBUG_ENTER("thr_downgrade_write_only_lock"); pthread_mutex_lock(&lock->mutex); @@ -1134,7 +1136,8 @@ void thr_downgrade_write_lock(THR_LOCK_DATA *in_data, DBUG_ASSERT(old_lock_type > new_lock_type); in_data->type= new_lock_type; check_locks(lock,"after downgrading lock",0); -#if 0 + +#if TO_BE_REMOVED switch (old_lock_type) { case TL_WRITE_ONLY: -- cgit v1.2.1