diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-22 15:52:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-22 15:52:15 +0200 |
| commit | ea65c36c19225f91a686c4cc33b1fe1527f1e785 (patch) | |
| tree | ae0f1a98a4c8478360e9c365fbd767264d164a43 /heap | |
| parent | 3b31ad35321a15ef22c4170a26e1060ca6313e44 (diff) | |
| download | mariadb-git-ea65c36c19225f91a686c4cc33b1fe1527f1e785.tar.gz | |
Fixed compiler warnings
Fixed wrong merge that disabled 'make test'
Renamed all suppress files to end in '.supp'
Don't give "skipped %d bytes from file" warnings in 5.0
mysql-test/purify.supp:
Rename: mysql-test/suppress.purify -> mysql-test/purify.supp
support-files/compiler_warnings.supp:
Rename: support-files/disabled_compiler_warnings.txt -> support-files/compiler_warnings.supp
Makefile.am:
Added back missing cd from wrong merge
heap/hp_write.c:
Fixed compiler warning
mysql-test/r/mysqlbinlog.result:
Fixed test case to drop all used tables at start and used tables after each test group
mysql-test/t/mysqlbinlog.test:
Fixed test case to drop all used tables at start and used tables after each test group
sql/net_serv.cc:
Don't give "skipped %d bytes from file" warnings in 5.0
(The proper fix for this is in 5.1)
sql/table.cc:
Fixed compiler warning
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 8a392d54c51..86e79c9d7ec 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -68,7 +68,7 @@ int heap_write(HP_INFO *info, const byte *record) err: if (my_errno == HA_ERR_FOUND_DUPP_KEY) - DBUG_PRINT("info",("Duplicate key: %d", keydef - share->keydef)); + DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef))); info->errkey= keydef - share->keydef; /* We don't need to delete non-inserted key from rb-tree. Also, if |