diff options
author | unknown <serg@mysql.com> | 2005-09-30 20:30:09 +0200 |
---|---|---|
committer | unknown <serg@mysql.com> | 2005-09-30 20:30:09 +0200 |
commit | d26e68ac7c12bcad3a4b97dc259ea110a827deef (patch) | |
tree | 778c75e28c050f727b123eaca67c82f625911683 /sql/ha_ndbcluster.cc | |
parent | 731cbd9e8a0ec420db9ae5120f69e320b6a1ed00 (diff) | |
parent | 9da7600994c0dbf5e221799b14f06276ad674150 (diff) | |
download | mariadb-git-d26e68ac7c12bcad3a4b97dc259ea110a827deef.tar.gz |
Merge
sql/ha_ndbcluster.cc:
SCCS merged
sql/handler.h:
SCCS merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 5018aa2990e..e801322b677 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3401,7 +3401,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) startTransaction for each transaction/statement. */ -int ha_ndbcluster::start_stmt(THD *thd) +int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type) { int error=0; DBUG_ENTER("start_stmt"); |