summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2020-04-16 22:56:51 +0200
committerAnel Husakovic <anel@mariadb.org>2020-04-16 22:56:54 +0200
commit8ab151e55e560972bad44a3e804a9c8a1ba600db (patch)
treed1f52217e5a5688e2929ad59968594774605c96e
parent6577a7a8f20538df80b851698e21095311aae190 (diff)
downloadmariadb-git-bb-10.3-anel-MDEV-22263.tar.gz
MDEV-22263: main.func_debug fails on a valgrind build with wrong resultbb-10.3-anel-MDEV-22263
Patches of interest:374dae3ecc49, 374dae3ecc49
-rw-r--r--mysql-test/main/func_debug.result2
-rw-r--r--sql/item_subselect.cc2
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