Auto merge
This commit is contained in:
commit
34c08c158c
@ -3,6 +3,8 @@
|
||||
#
|
||||
source include/have_log_bin.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;
|
||||
call mtr.add_suppression('Attempting backtrace');
|
||||
call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.');
|
||||
|
@ -5859,6 +5859,7 @@ inline void add_cond_and_fix(Item **e1, Item *e2)
|
||||
{
|
||||
*e1= res;
|
||||
res->quick_fix_field();
|
||||
res->update_used_tables();
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user