mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj
This commit is contained in:
commit
4224c50c13
1 changed files with 3 additions and 1 deletions
|
@ -4366,7 +4366,9 @@ static int ndbcluster_commit(handlerton *hton, THD *thd, bool all)
|
||||||
DBUG_PRINT("transaction",("%s",
|
DBUG_PRINT("transaction",("%s",
|
||||||
trans == thd_ndb->stmt ?
|
trans == thd_ndb->stmt ?
|
||||||
"stmt" : "all"));
|
"stmt" : "all"));
|
||||||
DBUG_ASSERT(ndb && trans);
|
DBUG_ASSERT(ndb);
|
||||||
|
if (trans == NULL)
|
||||||
|
DBUG_RETURN(0);
|
||||||
|
|
||||||
if (execute_commit(thd,trans) != 0)
|
if (execute_commit(thd,trans) != 0)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue