mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merge
This commit is contained in:
@ -893,8 +893,9 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
|
||||
Test if the query is a SELECT
|
||||
(pre-space is removed in dispatch_command)
|
||||
*/
|
||||
if (toupper(sql[0]) != 'S' || toupper(sql[1]) != 'E' ||
|
||||
toupper(sql[2]) !='L')
|
||||
if (my_toupper(system_charset_info, sql[0]) != 'S' ||
|
||||
my_toupper(system_charset_info, sql[1]) != 'E' ||
|
||||
my_toupper(system_charset_info,sql[2]) !='L')
|
||||
{
|
||||
DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached"));
|
||||
goto err;
|
||||
@ -1347,9 +1348,9 @@ ulong Query_cache::init_cache()
|
||||
|
||||
DUMP(this);
|
||||
|
||||
VOID(hash_init(&queries,def_query_hash_size, 0, 0,
|
||||
VOID(hash_init(&queries,system_charset_info,def_query_hash_size, 0, 0,
|
||||
query_cache_query_get_key, 0, 0));
|
||||
VOID(hash_init(&tables,def_table_hash_size, 0, 0,
|
||||
VOID(hash_init(&tables,system_charset_info,def_table_hash_size, 0, 0,
|
||||
query_cache_table_get_key, 0, 0));
|
||||
|
||||
queries_in_cache = 0;
|
||||
|
Reference in New Issue
Block a user