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 /myisam/myisamdef.h | |
| 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 'myisam/myisamdef.h')
| -rw-r--r-- | myisam/myisamdef.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 865c47fb7ea..9da669e8438 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -169,8 +169,8 @@ typedef struct st_mi_isam_share { /* Shared between opens */ ulong last_version; /* Version on start */ ulong options; /* Options used */ uint rec_reflength; /* rec_reflength in use now */ - int kfile; /* Shared keyfile */ - int data_file; /* Shared data file */ + File kfile; /* Shared keyfile */ + File data_file; /* Shared data file */ int mode; /* mode of file on open */ uint reopen; /* How many times reopened */ uint w_locks,r_locks; /* Number of read/write locks */ @@ -642,7 +642,7 @@ my_bool mi_check_status(void* param); void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); my_bool check_table_is_closed(const char *name, const char *where); -int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share); +int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, File file_to_dup); int mi_open_keyfile(MYISAM_SHARE *share); int _mi_init_bulk_insert(MI_INFO *info); |