diff options
author | unknown <monty@hundin.mysql.fi> | 2002-06-04 11:39:33 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-06-04 11:39:33 +0300 |
commit | fa86b948379ca3929ebd8a7b941d6c2fbb26f8ec (patch) | |
tree | cb48233048aee1e7e30a1c0a68353e10a1fb6564 /heap | |
parent | 7aef75a9a9b3f1965f1989bf224d8c9ba0090f86 (diff) | |
parent | f45dc577290c7298b33ba70eba1c8a80037201ff (diff) | |
download | mariadb-git-fa86b948379ca3929ebd8a7b941d6c2fbb26f8ec.tar.gz |
Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
heap/hp_write.c:
Auto merged
include/my_tree.h:
Auto merged
mysys/charset.c:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'heap')
-rw-r--r-- | heap/hp_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heap/hp_write.c b/heap/hp_write.c index 3e74a98b23c..33527855e60 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -89,7 +89,7 @@ err: */ int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const byte *record, - byte *recpos) + byte *recpos) { heap_rb_param custom_arg; |