mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user