diff options
| author | unknown <mskold@mysql.com> | 2005-04-13 16:24:17 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-04-13 16:24:17 +0200 |
| commit | f0438d548731b674ba989710da0994ac752c623d (patch) | |
| tree | a1492386b6bc2738d5f8216a4814cf7d15ec4dad /myisam/myisamdef.h | |
| parent | 5630f0731ab020471108c67e7ae962ba6eaef625 (diff) | |
| parent | f53284f1933d721e3f2a583c2849d9c1b2e2b740 (diff) | |
| download | mariadb-git-f0438d548731b674ba989710da0994ac752c623d.tar.gz | |
Merge
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/t/kill.test:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'myisam/myisamdef.h')
| -rw-r--r-- | myisam/myisamdef.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index b66d7e71a05..a2d3dedf6df 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -584,7 +584,7 @@ extern byte *mi_alloc_rec_buff(MI_INFO *,ulong, byte**); extern ulong _mi_rec_unpack(MI_INFO *info,byte *to,byte *from, ulong reclength); extern my_bool _mi_rec_check(MI_INFO *info,const char *record, byte *packpos, - ulong reclength); + ulong packed_length, my_bool with_checkum); extern int _mi_write_part_record(MI_INFO *info,my_off_t filepos,ulong length, my_off_t next_filepos,byte **record, ulong *reclength,int *flag); |