diff options
| author | unknown <monty@mysql.com> | 2006-06-23 02:49:19 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-23 02:49:19 +0300 |
| commit | e03f8ef25aa521dd698f185d4500e5eaab5766cb (patch) | |
| tree | 58ab5561c26c742cf51ff01378a1d269f85b5637 /mysys | |
| parent | b58e990c748d77637f127a819b41f440e60e1d7d (diff) | |
| download | mariadb-git-e03f8ef25aa521dd698f185d4500e5eaab5766cb.tar.gz | |
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
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_bitmap.c | 2 | ||||
| -rw-r--r-- | mysys/my_handler.c | 6 | ||||
| -rw-r--r-- | mysys/thr_lock.c | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 92b0cbb1371..2c85ce0bf04 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -101,7 +101,7 @@ static inline void bitmap_unlock(MY_BITMAP *map __attribute__((unused))) my_bool bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits, - my_bool thread_safe) + my_bool thread_safe __attribute__((unused))) { DBUG_ENTER("bitmap_init"); if (!buf) diff --git a/mysys/my_handler.c b/mysys/my_handler.c index 56f2298a9f0..da619a49ffd 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -504,6 +504,7 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) switch ((enum ha_base_keytype) keyseg->type) { case HA_KEYTYPE_TEXT: case HA_KEYTYPE_BINARY: + case HA_KEYTYPE_BIT: if (keyseg->flag & HA_SPACE_PACK) { int a_length; @@ -515,7 +516,9 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) a= end; break; case HA_KEYTYPE_VARTEXT1: + case HA_KEYTYPE_VARTEXT2: case HA_KEYTYPE_VARBINARY1: + case HA_KEYTYPE_VARBINARY2: { int a_length; get_key_length(a_length, a); @@ -545,6 +548,9 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) case HA_KEYTYPE_DOUBLE: a= end; break; + case HA_KEYTYPE_END: + DBUG_ASSERT(0); + break; } } return keyseg; 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: |