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 /storage/heap/hp_rsame.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 'storage/heap/hp_rsame.c')
| -rw-r--r-- | storage/heap/hp_rsame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/hp_rsame.c b/storage/heap/hp_rsame.c index 10513f91726..1a3724672b6 100644 --- a/storage/heap/hp_rsame.c +++ b/storage/heap/hp_rsame.c @@ -25,7 +25,7 @@ HA_ERR_KEY_NOT_FOUND = Record not found with key */ -int heap_rsame(register HP_INFO *info, byte *record, int inx) +int heap_rsame(register HP_INFO *info, uchar *record, int inx) { HP_SHARE *share=info->s; DBUG_ENTER("heap_rsame"); |