summaryrefslogtreecommitdiff
path: root/sql/temporary_tables.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-13 17:30:37 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-13 17:30:37 +0200
commit8fa759a5762733d9f8a4050437fadcd255ecd1a2 (patch)
tree093c167478abbbf6f51cd47f8df8651ee17f97f1 /sql/temporary_tables.cc
parent014e1258309da2475b8ae36d445261f87422adaf (diff)
parent3466b47b0d2f0aca0a2191574c593c7eaea0b0b8 (diff)
downloadmariadb-git-8fa759a5762733d9f8a4050437fadcd255ecd1a2.tar.gz
Merge 10.3 into 10.4
We disable the MDEV-21189 test galera.galera_partition because it times out.
Diffstat (limited to 'sql/temporary_tables.cc')
-rw-r--r--sql/temporary_tables.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/temporary_tables.cc b/sql/temporary_tables.cc
index b39423e9131..2e0f0a4918e 100644
--- a/sql/temporary_tables.cc
+++ b/sql/temporary_tables.cc
@@ -346,6 +346,13 @@ bool THD::open_temporary_table(TABLE_LIST *tl)
DBUG_RETURN(false);
}
+ if (!tl->db.str)
+ {
+ DBUG_PRINT("info",
+ ("Table reference to a temporary table must have database set"));
+ DBUG_RETURN(false);
+ }
+
/*
Temporary tables are not safe for parallel replication. They were
designed to be visible to one thread only, so have no table locking.