diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-05-06 12:41:21 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-05-06 12:41:21 +0200 |
| commit | 5c833689ac98991ea85a1a50565e2b1a6abe6c1f (patch) | |
| tree | 9512606665345653100600c24d786cf2c86d014f | |
| parent | b9c89ad038c31de3bc60eb5b5d55a2bf55b9185b (diff) | |
| parent | ef99edf1a87d5234cf0dd8d496f0adfbf4040dad (diff) | |
| download | mariadb-git-5c833689ac98991ea85a1a50565e2b1a6abe6c1f.tar.gz | |
Merge MDEV-8103 into 10.0mariadb-10.0.18
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 3731c646b20..619bd4bd98f 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5640,7 +5640,7 @@ TABLE *open_table_uncached(THD *thd, handlerton *hton, /* Temporary tables are not safe for parallel replication. */ if (thd->rgi_slave && thd->rgi_slave->is_parallel_exec && thd->wait_for_prior_commit()) - return NULL; + DBUG_RETURN(NULL); } /* Create the cache_key for temporary tables */ |