diff options
author | unknown <serg@serg.mylan> | 2003-10-15 12:25:44 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2003-10-15 12:25:44 +0200 |
commit | b192ab5edc45bf221f99ed53ce4d975160d830fa (patch) | |
tree | 39df3a873ccd4aba6541c6659c5508843742f8be /heap | |
parent | 9456073f90354e82c8b31335bac1d486c88f2f4a (diff) | |
parent | bbfa68d10202df2bf6bc8193d3355fb22f31cff7 (diff) | |
download | mariadb-git-b192ab5edc45bf221f99ed53ce4d975160d830fa.tar.gz |
merged
BitKeeper/etc/ignore:
auto-union
myisam/myisamdef.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'heap')
-rw-r--r-- | heap/hp_info.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/heap/hp_info.c b/heap/hp_info.c index 3122a665fac..e10d140e1f6 100644 --- a/heap/hp_info.c +++ b/heap/hp_info.c @@ -44,8 +44,7 @@ ulong heap_position_old(HP_INFO *info) /* Note that heap_info does NOT return information about the current position anymore; Use heap_position instead */ -int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, - int flag __attribute__((unused))) +int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag ) { DBUG_ENTER("heap_info"); x->records = info->s->records; |