diff options
| author | monty@mysql.com <> | 2004-06-25 18:49:36 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-25 18:49:36 +0300 |
| commit | f6765146c1b97bbb71f79adbd275dc2b6ca79333 (patch) | |
| tree | 3a9126456bcc45a3caaf4b6c53da125de2769da8 /sql/handler.cc | |
| parent | 00dc9a0e91835f4cae34d287b4351667fe7fe4dc (diff) | |
| download | mariadb-git-f6765146c1b97bbb71f79adbd275dc2b6ca79333.tar.gz | |
Added missing root user to mysql.user on windows. (Bug #4242)
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index e76bda1a6cc..e278d1a5308 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -222,11 +222,9 @@ bool ha_caching_allowed(THD* thd, char* table_key, { #ifdef HAVE_INNOBASE_DB if (cache_type == HA_CACHE_TBL_ASKTRANSACT) - return innobase_query_caching_of_table_permitted(thd, table_key, - key_length); - else + return innobase_query_caching_of_table_permitted(thd, table_key, key_length); #endif - return 1; + return 1; } int ha_init() |