diff options
| author | Anel Husakovic <anel@mariadb.org> | 2020-04-16 22:56:51 +0200 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-04-20 07:51:39 +0200 |
| commit | 42af2b1d8b8a8508c5aac5c2e0bcf4554c5200ce (patch) | |
| tree | c22120fc7721373ddc24a8621faff0b36caf75ff | |
| parent | 0155d64448eb2ea5988b594e39d49490a4ccf175 (diff) | |
| download | mariadb-git-42af2b1d8b8a8508c5aac5c2e0bcf4554c5200ce.tar.gz | |
MDEV-22263: main.func_debug fails on a valgrind build with wrong result
Patches of interest:374dae3ecc49, 374dae3ecc49
| -rw-r--r-- | mysql-test/main/func_debug.result | 2 | ||||
| -rw-r--r-- | 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 |