diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
| commit | 184e24b2253a81b03476e3d4d8cf56d5eb9dbf18 (patch) | |
| tree | fabb5447e17b9f0959cb83b6d88351367ca53645 /myisammrg | |
| parent | 298ba0d39d6d38d5be860a3ad8a55b469b67e7d8 (diff) | |
| download | mariadb-git-184e24b2253a81b03476e3d4d8cf56d5eb9dbf18.tar.gz | |
Fixed ALTER TABLE on MERGE tables
Fixed bug in DISTINCT
Docs/manual.texi:
Updated Changelog
Cleaned up adding character sets
merge/open.c:
skip comments
myisam/mi_check.c:
Fixed bug when sorting index on Windows
myisammrg/myrg_info.c:
Use only portable printf arguments
myisammrg/myrg_rrnd.c:
Use only portable printf arguments
mysql-test/r/distinct.result:
Added test case for bug in distinct
mysql-test/r/merge.result:
Added test for ALTER TABLE
mysql-test/t/distinct.test:
Added test case for bug in distinct
mysql-test/t/merge.test:
Added test for ALTER TABLE
sql-bench/crash-me.sh:
Fixed portability issues
sql/ha_myisammrg.cc:
Fixed for ALTER TABLE on MERGE tables
sql/item_sum.cc:
Fixed bug in DISTINCT
sql/sql_db.cc:
Added test of namelen in check_db_name
sql/sql_select.cc:
Fixed bug in DISTINCT
sql/sql_select.h:
Fixed bug in DISTINCT
sql/sql_table.cc:
Fixed ALTER TABLE on MERGE tables
sql/table.cc:
Added test of namelen in check_db_name
sql/table.h:
Fixed ALTER TABLE on MERGE tables
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_info.c | 4 | ||||
| -rw-r--r-- | myisammrg/myrg_rrnd.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/myisammrg/myrg_info.c b/myisammrg/myrg_info.c index 304216a8276..8ca830339b9 100644 --- a/myisammrg/myrg_info.c +++ b/myisammrg/myrg_info.c @@ -52,8 +52,8 @@ int myrg_status(MYRG_INFO *info,register MYMERGE_INFO *x,int flag) info->data_file_length+=file->table->s->state.state.data_file_length; info->records+=file->table->s->state.state.records; info->del+=file->table->s->state.state.del; - DBUG_PRINT("info2",("table: %s, offset: 0x%08lx", - file->table->filename,(ulong)file->file_offset)); + DBUG_PRINT("info2",("table: %s, offset: %lu", + file->table->filename,(ulong) file->file_offset)); } x->records = info->records; x->deleted = info->del; diff --git a/myisammrg/myrg_rrnd.c b/myisammrg/myrg_rrnd.c index 77fe00a1bb1..46bd3850bb5 100644 --- a/myisammrg/myrg_rrnd.c +++ b/myisammrg/myrg_rrnd.c @@ -36,7 +36,7 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos) int error; MI_INFO *isam_info; DBUG_ENTER("myrg_rrnd"); - DBUG_PRINT("info",("offset: 0x%016qx", (ulonglong)filepos)); + DBUG_PRINT("info",("offset: %lu", (ulong) filepos)); if (filepos == HA_OFFSET_ERROR) { @@ -109,7 +109,7 @@ static MYRG_TABLE *find_table(MYRG_TABLE *start, MYRG_TABLE *end, else start=mid; } - DBUG_PRINT("info",("offset: 0x%016qx, table: %s", - (ulonglong)pos, start->table->filename)); + DBUG_PRINT("info",("offset: %lu, table: %s", + (ulong) pos, start->table->filename)); DBUG_RETURN(start); } |