diff options
| author | monty@mashka.mysql.fi <> | 2003-11-18 13:47:27 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-11-18 13:47:27 +0200 |
| commit | cab1dc628c116f042a3fd8dbc505f7ca2df599a3 (patch) | |
| tree | 0a23d90c946c5f05a8c160fc7c6ef3f05505fc79 /myisam/myisamdef.h | |
| parent | f277c9f88a4a2e392e44cfdb6b3f4785b6c730d0 (diff) | |
| download | mariadb-git-cab1dc628c116f042a3fd8dbc505f7ca2df599a3.tar.gz | |
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
Diffstat (limited to 'myisam/myisamdef.h')
| -rw-r--r-- | myisam/myisamdef.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index c23959d995c..4f1bed5d50a 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -166,8 +166,7 @@ typedef struct st_mi_isam_share { /* Shared between opens */ char *data_file_name, /* Resolved path names from symlinks */ *index_file_name; byte *file_map; /* mem-map of file if possible */ - KEY_CACHE_HANDLE *keycache; /* ref to the current key cache */ - KEY_CACHE_HANDLE *reg_keycache; /* ref to the registered key cache */ + KEY_CACHE_HANDLE *key_cache; /* ref to the current key cache */ MI_DECODE_TREE *decode_trees; uint16 *decode_tables; int (*read_record)(struct st_myisam_info*, my_off_t, byte*); @@ -188,6 +187,7 @@ typedef struct st_mi_isam_share { /* Shared between opens */ ulong max_pack_length; ulong state_diff_length; uint rec_reflength; /* rec_reflength in use now */ + uint unique_name_length; File kfile; /* Shared keyfile */ File data_file; /* Shared data file */ int mode; /* mode of file on open */ @@ -713,6 +713,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param); #ifdef THREAD pthread_handler_decl(thr_find_all_keys,arg); #endif +int flush_blocks(MI_CHECK *param, KEY_CACHE_HANDLE key_cache, File file); int sort_write_record(MI_SORT_PARAM *sort_param); int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ulong); |