Skip to content

M
MariaDB
Commit 644015d2 authored by He Zhenxing's avatar He Zhenxing
Browse files
Options

Auto merge

parents 6878d7e7 ebed1914
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
mysql-test/suite/binlog/t/binlog_index.test
View file @ 644015d2
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
# #
source include/have_log_bin.inc; source include/have_log_bin.inc;
source include/not_embedded.inc; source include/not_embedded.inc;
# Don't test this under valgrind, memory leaks will occur
--source include/not_valgrind.inc
source include/have_debug.inc; source include/have_debug.inc;
call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
......
sql/sql_select.cc
View file @ 644015d2
...@@ -5859,6 +5859,7 @@ inline void add_cond_and_fix(Item **e1, Item *e2) ...@@ -5859,6 +5859,7 @@ inline void add_cond_and_fix(Item **e1, Item *e2)
{ {
*e1= res; *e1= res;
res->quick_fix_field(); res->quick_fix_field();
res->update_used_tables();
} }
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7