summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-12-23 19:28:02 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-12-23 19:28:02 +0100
commit25561435e0b1fe42ec29d5ab06dc15875cdd1cfa (patch)
treed2e67d4509577d84da7ade2820154c904180e151 /sql/sql_cache.cc
parentfa1aef39ebc7d84d24d4e3d2124f982526632ee9 (diff)
parent8d8370e31d48e0bc6139c18770746f9959c21598 (diff)
downloadmariadb-git-25561435e0b1fe42ec29d5ab06dc15875cdd1cfa.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r--sql/sql_cache.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index e2c98715b12..497e51dfdce 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1450,7 +1450,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
DBUG_PRINT("qcache", ("\
long %d, 4.1: %d, eof: %d, bin_proto: %d, more results %d, pkt_nr: %d, \
CS client: %u, CS result: %u, CS conn: %u, limit: %llu, TZ: %p, \
-sql mode: 0x%llx, sort len: %llu, conncat len: %llu, div_precision: %zu, \
+sql mode: 0x%llx, sort len: %llu, concat len: %u, div_precision: %zu, \
def_week_frmt: %zu, in_trans: %d, autocommit: %d",
(int)flags.client_long_flag,
(int)flags.client_protocol_41,
@@ -1950,7 +1950,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
DBUG_PRINT("qcache", ("\
long %d, 4.1: %d, eof: %d, bin_proto: %d, more results %d, pkt_nr: %d, \
CS client: %u, CS result: %u, CS conn: %u, limit: %llu, TZ: %p, \
-sql mode: 0x%llx, sort len: %llu, conncat len: %llu, div_precision: %zu, \
+sql mode: 0x%llx, sort len: %llu, concat len: %u, div_precision: %zu, \
def_week_frmt: %zu, in_trans: %d, autocommit: %d",
(int)flags.client_long_flag,
(int)flags.client_protocol_41,