Merge MDEV-8103 into 10.0

5c833689 · Kristian Nielsen · b9c89ad0 · ef99edf1 · 5c833689
Commit 5c833689 authored May 06, 2015 by Kristian Nielsen
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_base.cc sql/sql_base.cc +1 -1

No files found.
--- 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 */