diff options
| author | konstantin@mysql.com <> | 2005-07-19 22:21:12 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-07-19 22:21:12 +0400 |
| commit | 14344b658a2a41a221bc71399c9211145dac8b03 (patch) | |
| tree | edda5c9dfcd664864671ccb706df789fbf268a14 /sql/ha_ndbcluster.cc | |
| parent | f40ac0bb9915501f74964c9edcd57deaa241ee61 (diff) | |
| download | mariadb-git-14344b658a2a41a221bc71399c9211145dac8b03.tar.gz | |
A fix and a test case for Bug#10760 and complementary cleanups.
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index d35b8af80aa..81723690b83 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -62,7 +62,8 @@ static handlerton ndbcluster_hton = { NULL, /* prepare */ NULL, /* recover */ NULL, /* commit_by_xid */ - NULL /* rollback_by_xid */ + NULL, /* rollback_by_xid */ + HTON_NO_FLAGS }; #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8 @@ -4174,7 +4175,7 @@ ulonglong ha_ndbcluster::get_auto_increment() */ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): - handler(table_arg), + handler(&ndbcluster_hton, table_arg), m_active_trans(NULL), m_active_cursor(NULL), m_table(NULL), |