diff options
| author | unknown <jani@linux-th5m.site> | 2007-05-24 15:26:10 +0300 |
|---|---|---|
| committer | unknown <jani@linux-th5m.site> | 2007-05-24 15:26:10 +0300 |
| commit | 6356f5631c1b6dab40b747abe54797f1779aef80 (patch) | |
| tree | 95c9c78dd2df7c497babc3d932ae30ceb98d1296 /mysys/testhash.c | |
| parent | 7932fb543241d77c0f10e172d144273e3c640512 (diff) | |
| parent | 6e849907977dd503ad82b9aa5039d17b5db1d7b7 (diff) | |
| download | mariadb-git-6356f5631c1b6dab40b747abe54797f1779aef80.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into linux-th5m.site:/home/my/mysql-5.1-marvel
include/keycache.h:
Auto merged
include/my_sys.h:
Auto merged
mysys/my_static.c:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_preload.c:
Auto merged
mysys/mf_keycache.c:
Manual merge from main 5.1
Diffstat (limited to 'mysys/testhash.c')
| -rw-r--r-- | mysys/testhash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/testhash.c b/mysys/testhash.c index 0961558afd3..2add2ebd2d7 100644 --- a/mysys/testhash.c +++ b/mysys/testhash.c @@ -38,11 +38,11 @@ my_bool hash_check(HASH *hash); void free_record(void *record); -static byte *hash2_key(const byte *rec,uint *length, +static uchar *hash2_key(const uchar *rec,uint *length, my_bool not_used __attribute__((unused))) { *length=(uint) (uchar) rec[reclength-1]; - return (byte*) rec; + return (uchar*) rec; } /* main program */ @@ -196,7 +196,7 @@ static int do_test() pos=0; while ((recpos=hash_element(&hash,0))) { - record=(byte*) my_malloc(reclength,MYF(MY_FAE)); + record=(uchar*) my_malloc(reclength,MYF(MY_FAE)); memcpy(record,recpos,reclength); record[reclength-1]=rnd(5)+1; if (my_hash_insert(&hash2,record)) |