diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-06-28 20:03:46 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-06-28 20:03:46 +0300 |
| commit | 36daa4d97129d5e5a4f03a6bf4ae31afafaef16e (patch) | |
| tree | 1bfc8aa04338b5d1977347fc1984cddb5eaa98c6 /mysys | |
| parent | e2bf3f0318b9b641127ff63c2f8e2b282554cf39 (diff) | |
| parent | e4f4f9dfa5d4c4eaea65820c947008a83cf07802 (diff) | |
| download | mariadb-git-36daa4d97129d5e5a4f03a6bf4ae31afafaef16e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
BitKeeper/etc/ignore:
auto-union
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_handler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index da619a49ffd..bfec44d57a4 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -548,7 +548,8 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) case HA_KEYTYPE_DOUBLE: a= end; break; - case HA_KEYTYPE_END: + case HA_KEYTYPE_END: /* purecov: inspected */ + /* keep compiler happy */ DBUG_ASSERT(0); break; } |