diff options
author | unknown <monty@hundin.mysql.fi> | 2001-08-19 14:43:51 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-08-19 14:43:51 +0300 |
commit | cfdf5fee2087dde1db4239b4d9a9f16bfb78ac05 (patch) | |
tree | e2a8b10d8dae9fee5283beb230210199e135ef74 /mysys/my_fstream.c | |
parent | e3a9e7e40e63e8bed554cfbceacf29490df1a14a (diff) | |
download | mariadb-git-cfdf5fee2087dde1db4239b4d9a9f16bfb78ac05.tar.gz |
Fix of UNION code
Added heap_delete_table
Added HA_EXTRA_PREPARE_FOR_DELETE
Added and use my_dup() for faster open of tables.
Removed not working no-mix-table-type
BitKeeper/deleted/.del-=6~33f33b0a159dc5d5:
Delete: =6
heap/hp_clear.c:
Cleanup
heap/hp_close.c:
Added delayed delete
heap/hp_create.c:
Added heap_delete_table
heap/hp_delete.c:
cleanup
heap/hp_test2.c:
Added heap_delete_table
include/heap.h:
Added heap_delete_table
include/my_base.h:
Added HA_EXTRA_PREPARE_FOR_DELETE
include/my_sys.h:
Adde my_dup and set_prealloc_root
isam/extra.c:
Added HA_EXTRA_PREPARE_FOR_DELETE
myisam/mi_check.c:
use my_dup
myisam/mi_extra.c:
use my_dup
myisam/mi_open.c:
use my_dup
myisam/myisamchk.c:
use my_dup
myisam/myisamdef.h:
use my_dup
mysys/Makefile.am:
my_dup
mysys/hash.c:
Add hash_replace
mysys/mf_pack.c:
cleanup
mysys/my_alloc.c:
Add set_prealloc_root
mysys/my_fstream.c:
cleanup
mysys/my_lib.c:
cleanup
mysys/my_seek.c:
cleanup
sql/ha_heap.cc:
Uses heap_delete_table()
sql/mysqld.cc:
Fix SIGHUP usage
Remove no-mix-table-types
sql/share/czech/errmsg.txt:
new error message
sql/share/danish/errmsg.txt:
new error message
sql/share/dutch/errmsg.txt:
new error message
sql/share/english/errmsg.txt:
new error message
sql/share/estonian/errmsg.txt:
new error message
sql/share/french/errmsg.txt:
new error message
sql/share/german/errmsg.txt:
new error message
sql/share/greek/errmsg.txt:
new error message
sql/share/hungarian/errmsg.txt:
new error message
sql/share/italian/errmsg.txt:
new error message
sql/share/japanese/errmsg.txt:
new error message
sql/share/korean/errmsg.txt:
new error message
sql/share/norwegian-ny/errmsg.txt:
new error message
sql/share/norwegian/errmsg.txt:
new error message
sql/share/polish/errmsg.txt:
new error message
sql/share/portuguese/errmsg.txt:
new error message
sql/share/romanian/errmsg.txt:
new error message
sql/share/russian/errmsg.txt:
new error message
sql/share/slovak/errmsg.txt:
new error message
sql/share/spanish/errmsg.txt:
new error message
sql/share/swedish/errmsg.txt:
new error message
sql/sql_base.cc:
remove no-mix-table-type
sql/sql_parse.cc:
Fix UNION code
Diffstat (limited to 'mysys/my_fstream.c')
-rw-r--r-- | mysys/my_fstream.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_fstream.c b/mysys/my_fstream.c index d93caadbcdc..a38e1334bca 100644 --- a/mysys/my_fstream.c +++ b/mysys/my_fstream.c @@ -147,7 +147,8 @@ uint my_fwrite(FILE *stream, const byte *Buffer, uint Count, myf MyFlags) /* Seek to position in file */ /* ARGSUSED */ -my_off_t my_fseek(FILE *stream, my_off_t pos, int whence, myf MyFlags) +my_off_t my_fseek(FILE *stream, my_off_t pos, int whence, + myf MyFlags __attribute__((unused))) { DBUG_ENTER("my_fseek"); DBUG_PRINT("my",("stream: %lx pos: %lu whence: %d MyFlags: %d", @@ -160,7 +161,7 @@ my_off_t my_fseek(FILE *stream, my_off_t pos, int whence, myf MyFlags) /* Tell current position of file */ /* ARGSUSED */ -my_off_t my_ftell(FILE *stream, myf MyFlags) +my_off_t my_ftell(FILE *stream, myf MyFlags __attribute__((unused))) { off_t pos; DBUG_ENTER("my_ftell"); |