diff options
author | unknown <monty@donna.mysql.fi> | 2001-05-17 00:46:50 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.fi> | 2001-05-17 00:46:50 +0300 |
commit | ebe9b6071a73d6953855fd0b2b5144b5b93194fb (patch) | |
tree | bfa83a61c2689e0f64e7be02d414bcf366c068a1 /myisam/mi_search.c | |
parent | c23dbe674d9cba45aa3ce0b87e50f83f3d2e9d52 (diff) | |
download | mariadb-git-ebe9b6071a73d6953855fd0b2b5144b5b93194fb.tar.gz |
Fixed bug when using MERGE on files > 4G
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
Changed that tmp_table_size =4G-1 means unlimited.
Docs/manual.texi:
Added new section about crashed MyISAM tables.
Cleaned up subsections for InnoDB
client/mysql.cc:
Cleanup
myisam/mi_rkey.c:
Cleanup
myisam/mi_search.c:
Fixed wrong casts in debug messages
myisammrg/myrg_rrnd.c:
Fixed bug when using files > 4G
mysys/getvar.c:
Changed to use longlong to support arguments up to 4G
mysys/thr_lock.c:
Fix for delay insert
sql/mysqld.cc:
Increased default size for temporary tables
sql/sql_base.cc:
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
sql/sql_insert.cc:
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
sql/sql_select.cc:
Changed that tmp_table_size =4G-1 means unlimited.
Diffstat (limited to 'myisam/mi_search.c')
-rw-r--r-- | myisam/mi_search.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/myisam/mi_search.c b/myisam/mi_search.c index 4dc5a5099d5..2c04679ed4c 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -158,7 +158,7 @@ int _mi_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, info->page_changed=0; info->buff_used= (info->buff != buff); /* If we have to reread buff */ - DBUG_PRINT("exit",("found key at %ld",info->lastpos)); + DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos)); DBUG_RETURN(0); err: DBUG_PRINT("exit",("Error: %d",my_errno)); @@ -1276,7 +1276,7 @@ int _mi_search_next(register MI_INFO *info, register MI_KEYDEF *keyinfo, } memcpy(info->lastkey,lastkey,info->lastkey_length); info->lastpos=_mi_dpos(info,0,info->lastkey+info->lastkey_length); - DBUG_PRINT("exit",("found key at %d",info->lastpos)); + DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos)); DBUG_RETURN(0); } /* _mi_search_next */ @@ -1318,7 +1318,7 @@ int _mi_search_first(register MI_INFO *info, register MI_KEYDEF *keyinfo, info->page_changed=info->buff_used=0; info->lastpos=_mi_dpos(info,0,info->lastkey+info->lastkey_length); - DBUG_PRINT("exit",("found key at %d",info->lastpos)); + DBUG_PRINT("exit",("found key at %ld",(ulong) info->lastpos)); DBUG_RETURN(0); } /* _mi_search_first */ @@ -1362,7 +1362,7 @@ int _mi_search_last(register MI_INFO *info, register MI_KEYDEF *keyinfo, info->last_search_keypage=info->last_keypage; info->page_changed=info->buff_used=0; - DBUG_PRINT("exit",("found key at %d",info->lastpos)); + DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos)); DBUG_RETURN(0); } /* _mi_search_last */ |