summaryrefslogtreecommitdiff
path: root/mysys/my_handler.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-06-23 02:49:19 +0300
committerunknown <monty@mysql.com>2006-06-23 02:49:19 +0300
commite03f8ef25aa521dd698f185d4500e5eaab5766cb (patch)
tree58ab5561c26c742cf51ff01378a1d269f85b5637 /mysys/my_handler.c
parentb58e990c748d77637f127a819b41f440e60e1d7d (diff)
downloadmariadb-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/my_handler.c')
-rw-r--r--mysys/my_handler.c6
1 files changed, 6 insertions, 0 deletions
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;