Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria

into  gbichot4.local:/home/mysql_src/mysql-maria-for-undo-phase

mysql-test/t/maria.test

@@ -1303,6 +1303,8 @@ update t1 set s1=2 where seq=1;
 check table t1 extended;
 drop table t1;
 
+# Fix if we are using safemalloc
+--replace_result 8388572 8388600
 show variables like 'maria%';
 --replace_column 2 #
 show status like 'maria%';