Merge branch '10.1' of github.com:MariaDB/server into 10.1

mysql-test/r/temp_table_frm.result

+set @@session.max_heap_table_size=16*1024*1024;
 create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
 create temporary table t2 (a int) engine=memory;
 select variable_name, session_status.variable_value - t1.variable_value

mysql-test/t/temp_table_frm.test

 #
 # MDEV-4260 Don't create frm files for temporary tables
 #
+
+# Ensure we don't overflow the internal heap table size in the join
+set @@session.max_heap_table_size=16*1024*1024;
 create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
 create temporary table t2 (a int) engine=memory;
 select variable_name, session_status.variable_value - t1.variable_value