From 42af2b1d8b8a8508c5aac5c2e0bcf4554c5200ce Mon Sep 17 00:00:00 2001 From: Anel Husakovic Date: Thu, 16 Apr 2020 22:56:51 +0200 Subject: [PATCH] MDEV-22263: main.func_debug fails on a valgrind build with wrong result Patches of interest:374dae3ecc49, 374dae3ecc49 --- mysql-test/main/func_debug.result | 2 +- sql/item_subselect.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/func_debug.result b/mysql-test/main/func_debug.result index 165b9ca5201..e2bf0ca8df3 100644 --- a/mysql-test/main/func_debug.result +++ b/mysql-test/main/func_debug.result @@ -1671,6 +1671,6 @@ a 2 9 Warnings: -Note 1105 DBUG: Item_subselect::exec (select max(`test`.`t1`.`a`) from `test`.`t... +Note 1105 DBUG: Item_subselect::exec (select max(`test`.`t1`.`a`) from `test`.`t1`) DROP TABLE t1; SET SESSION debug_dbug="-d,Item_subselect"; diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 8b024715aac..2991709b0a6 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -717,7 +717,7 @@ bool Item_subselect::exec() push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, ER_UNKNOWN_ERROR, "DBUG: Item_subselect::exec %.*s", - print.length(),print.ptr()); + print.length(),print.c_ptr()); ); /* Do not execute subselect in case of a fatal error