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 /sql/ha_myisammrg.cc | |
| 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 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 05da214c1d4..a834ace7032 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -35,9 +35,12 @@ const char **ha_myisammrg::bas_ext() const { static const char *ext[]= { ".MRG", NullS }; return ext; } + int ha_myisammrg::open(const char *name, int mode, uint test_if_locked) { char name_buff[FN_REFLEN]; + KEY_CACHE_VAR *key_cache; + DBUG_PRINT("info", ("ha_myisammrg::open")); if (!(file=myrg_open(fn_format(name_buff,name,"","",2 | 4), mode, test_if_locked))) @@ -45,12 +48,6 @@ int ha_myisammrg::open(const char *name, int mode, uint test_if_locked) DBUG_PRINT("info", ("ha_myisammrg::open exit %d", my_errno)); return (my_errno ? my_errno : -1); } - /* Synchronize key cache assignment for the file */ - KEY_CACHE_VAR *key_cache= table->key_cache ? table->key_cache : - &dflt_key_cache_var; - VOID(myrg_extra(file, HA_EXTRA_SET_KEY_CACHE, - (void*) &key_cache->cache)); - DBUG_PRINT("info", ("ha_myisammrg::open myrg_extrafunc...")) myrg_extrafunc(file, query_cache_invalidate_by_MyISAM_filename_ref); if (!(test_if_locked == HA_OPEN_WAIT_IF_LOCKED || |