diff options
| author | unknown <joreland@mysql.com> | 2004-09-20 20:56:16 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-09-20 20:56:16 +0200 |
| commit | 04844921b9bb50c48964c8066b2282c18f97931d (patch) | |
| tree | 61b5f6f1dc7677b16bc64259d7653582f92734c3 /sql/ha_ndbcluster.h | |
| parent | 76f06e4a4a39599cd595a6d795ca53e221abfeba (diff) | |
| parent | 7df58b8cb3ea67dc5534b6e0488f29881fb4377a (diff) | |
| download | mariadb-git-04844921b9bb50c48964c8066b2282c18f97931d.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index c0ef172413f..eb4556a606b 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -264,6 +264,8 @@ class ha_ndbcluster: public handler void no_uncommitted_rows_update(int); void no_uncommitted_rows_init(THD *); void no_uncommitted_rows_reset(THD *); + + friend int execute_no_commit(ha_ndbcluster*, NdbConnection*); }; bool ndbcluster_init(void); |