diff options
| author | unknown <mskold@mysql.com> | 2005-04-21 13:12:59 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-04-21 13:12:59 +0200 |
| commit | da43c3cc6d2eaef41ee2c35a5b1a28d0eea80f93 (patch) | |
| tree | 954c5ca55c5a43e2db6322f99fc0fe9075e84b9a /sql | |
| parent | bfe12fdb8df7cc999d58687b1ab0af50acf7040d (diff) | |
| parent | e2f5671064639b4dfe22fda07349fa00220a9af2 (diff) | |
| download | mariadb-git-da43c3cc6d2eaef41ee2c35a5b1a28d0eea80f93.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f61a1a40aab..9ca4e1de106 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -1990,6 +1990,7 @@ int ha_ndbcluster::write_row(byte *record) m_bulk_insert_not_flushed= TRUE; if ((m_rows_to_insert == (ha_rows) 1) || ((m_rows_inserted % m_bulk_insert_rows) == 0) || + m_primary_key_update || set_blob_value) { // Send rows to NDB @@ -2115,17 +2116,19 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data) if (delete_res) { DBUG_PRINT("info", ("delete failed")); - // Undo write_row(new_data) DBUG_RETURN(delete_res); } // Insert new row DBUG_PRINT("info", ("delete succeded")); + m_primary_key_update= TRUE; insert_res= write_row(new_data); + m_primary_key_update= FALSE; if (insert_res) { DBUG_PRINT("info", ("insert failed")); if (trans->commitStatus() == NdbConnection::Started) { + // Undo write_row(new_data) m_primary_key_update= TRUE; insert_res= write_row((byte *)old_data); m_primary_key_update= FALSE; |