diff options
| author | unknown <mskold/marty@linux.site> | 2007-06-14 16:10:11 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-06-14 16:10:11 +0200 |
| commit | d168b042a9afbb83e1f061f0628c3ed26f7a6f0c (patch) | |
| tree | a4087bf20e48a9356970aa6fe70b76e2f20a2612 /sql/ha_ndbcluster.cc | |
| parent | 0180e8f302dade9d0f0114c90b142fdc8c185608 (diff) | |
| parent | 103c1eeffe00b264ae74f081b0f6c29b4e0b68bb (diff) | |
| download | mariadb-git-d168b042a9afbb83e1f061f0628c3ed26f7a6f0c.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index ea21dc09b0a..70f3d9e1a91 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4248,8 +4248,6 @@ THR_LOCK_DATA **ha_ndbcluster::store_lock(THD *thd, extern MASTER_INFO *active_mi; static int ndbcluster_update_apply_status(THD *thd, int do_update) { - return 0; - Thd_ndb *thd_ndb= get_thd_ndb(thd); Ndb *ndb= thd_ndb->ndb; NDBDICT *dict= ndb->getDictionary(); |