diff options
| author | unknown <monty@mysql.com> | 2004-06-25 18:49:36 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-25 18:49:36 +0300 |
| commit | 4e664e3e43b1b0e2a37eadb8a6e28142db444352 (patch) | |
| tree | 3a9126456bcc45a3caaf4b6c53da125de2769da8 /sql/handler.cc | |
| parent | 9e630fa088c9f2d7102d6cb36245b09ea655e33d (diff) | |
| download | mariadb-git-4e664e3e43b1b0e2a37eadb8a6e28142db444352.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
scripts/fill_func_tables.sh:
Change mode to -rw-rw-r--
scripts/make_win_src_distribution.sh:
Safer remove of SCCS directories
scripts/mysql_create_system_tables.sh:
Added missing root user to mysql.user on windows. (Bug #4242)
scripts/mysql_install_db.sh:
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)
sql/filesort.cc:
Don't use default arguments for ha_rnd_init()
sql/ha_berkeley.cc:
Better to use #ifdef than // to disable code
Removed not needed setting of active_index (It's set in index_end)
sql/ha_berkeley.h:
Don't use default arguments for ha_rnd_init()
sql/ha_heap.h:
Don't use default arguments for ha_rnd_init()
sql/ha_innodb.h:
Don't use default arguments for ha_rnd_init()
sql/ha_isam.h:
Don't use default arguments for ha_rnd_init()
sql/ha_isammrg.h:
Don't use default arguments for ha_rnd_init()
sql/ha_myisam.cc:
Fixed wrong previous patch (New code used 'and' between two conditions when it should be 'or' as in original code)
sql/ha_myisam.h:
Don't use default arguments for ha_rnd_init()
sql/ha_myisammrg.h:
Don't use default arguments for ha_rnd_init()
sql/ha_ndbcluster.h:
Don't use default arguments for ha_rnd_init()
sql/handler.cc:
Code cleanup
sql/handler.h:
Keep bool variables together (better alignment)
sql/records.cc:
Don't use default arguments for ha_rnd_init()
sql/sql_select.cc:
Don't use default arguments for ha_rnd_init()
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() |