diff options
| author | unknown <serg@janus.mylan> | 2007-03-30 20:04:21 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-30 20:04:21 +0200 |
| commit | 986d6a2852c8d3ea2cab353aa1df53d8f698824c (patch) | |
| tree | 5d6c60ea91a2116fba25f695a733117457a9b8c0 /sql/ha_ndbcluster.cc | |
| parent | fe8c67effa5b11ccb7ed668c6cfcec39f756281d (diff) | |
| parent | 21af9a55dd6b84b22e3ded4c8336330798bd225e (diff) | |
| download | mariadb-git-986d6a2852c8d3ea2cab353aa1df53d8f698824c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 5c7ba12a5da..a99ab3a16f4 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3659,8 +3659,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) { m_transaction_on= FALSE; /* Would be simpler if has_transactions() didn't always say "yes" */ - thd->options|= OPTION_STATUS_NO_TRANS_UPDATE; - thd->no_trans_update= TRUE; + thd->no_trans_update.all= thd->no_trans_update.stmt= TRUE; } else if (!thd->transaction.on) m_transaction_on= FALSE; |