diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-05 08:39:12 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-05 08:39:12 +0200 |
| commit | 499d058c2d4a3a21ece73ccfccebca62672a6517 (patch) | |
| tree | 65f485d2be885f33d90600d09460d7d0e3505d99 /sql/ha_ndbcluster.h | |
| parent | 865cd0108a718d0231daf98367f64fce0c46d3f3 (diff) | |
| parent | cfe2d1da886ea48c445076a3509b76ea1242e54d (diff) | |
| download | mariadb-git-499d058c2d4a3a21ece73ccfccebca62672a6517.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-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 6b49b0e3c70..3495f35e10f 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -774,6 +774,8 @@ bool uses_blob_value(bool all_fields); 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; |