mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 13:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source 
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
heap/_check.c:
  Merge: Fixed DBUG_PRINT() usage
This commit is contained in:
unknown 2002-10-14 17:50:44 +03:00
commit a08b786b09
23 changed files with 136 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
heap/_check.c
View file

@ -116,13 +116,11 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records,
SEARCH_FIND | SEARCH_SAME, &not_used))
{
error= 1;
DBUG_PRINT("error",("Record in wrong link: Link %d Record: %lx\n",
key, recpos));
DBUG_PRINT("error",("Record in wrong link: key: %d Record: %lx\n",
keynr, recpos));
}
else
{
found++;
}
key= tree_search_next(&keydef->rb_tree, &info->last_pos,
offsetof(TREE_ELEMENT, left),
offsetof(TREE_ELEMENT, right));
@ -130,7 +128,7 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records,
}
if (found != records)
{
DBUG_PRINT("error",("Found %ld of %ld records", found, records));
DBUG_PRINT("error",("Found %lu of %lu records", found, records));
error= 1;
}
if (print_status)