Merge MDEV-8103 into 10.0

MariaDB · May 6, 2015 · 5c83368 · 5c83368
2 parents b9c89ad + ef99edf
commit 5c83368
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 */