diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-14 17:50:44 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-14 17:50:44 +0300 |
| commit | a08b786b0963e4de430657203df9f9d6f96b96ef (patch) | |
| tree | c79c25cc391968bfcdb07eaf6c69e1d0bf26358a /heap | |
| parent | 393e96afdc852620eb2af7c63ebebb76472c1813 (diff) | |
| parent | 6fc7e94616ef775731423db63af7fc506fdddcae (diff) | |
| download | mariadb-git-a08b786b0963e4de430657203df9f9d6f96b96ef.tar.gz | |
Merge
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
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/_check.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/heap/_check.c b/heap/_check.c index fcc40a5413d..4a6482901d9 100644 --- a/heap/_check.c +++ b/heap/_check.c @@ -116,13 +116,11 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records, SEARCH_FIND | SEARCH_SAME, ¬_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) |