diff options
| author | unknown <mskold/marty@linux.site> | 2007-04-04 17:03:31 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-04-04 17:03:31 +0200 |
| commit | 7279edc72dd951e356db1cf9842115452a5773a1 (patch) | |
| tree | dd37944358fa408c8d0b0528e0d416320718c1e4 /sql/ha_ndbcluster.h | |
| parent | 2770bf0bfcc73c78b37320c4662c27c72b9d9e12 (diff) | |
| parent | 59a64c2b1604649be464d38141e2345c79d27bd3 (diff) | |
| download | mariadb-git-7279edc72dd951e356db1cf9842115452a5773a1.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
include/my_base.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/ha_ndbcluster.cc:
Merge
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 98f6efe15d8..fe79135a47d 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -964,6 +964,8 @@ private: ha_rows m_bulk_insert_rows; ha_rows m_rows_changed; bool m_bulk_insert_not_flushed; + bool m_delete_cannot_batch; + bool m_update_cannot_batch; ha_rows m_ops_pending; bool m_skip_auto_increment; bool m_blobs_pending; |