1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
This commit is contained in:
unknown 2005-04-21 13:12:59 +02:00
commit da43c3cc6d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/ha_ndbcluster.cc
View File

@ -1990,6 +1990,7 @@ int ha_ndbcluster::write_row(byte *record)
m_bulk_insert_not_flushed= TRUE; m_bulk_insert_not_flushed= TRUE;
if ((m_rows_to_insert == (ha_rows) 1) || if ((m_rows_to_insert == (ha_rows) 1) ||
((m_rows_inserted % m_bulk_insert_rows) == 0) || ((m_rows_inserted % m_bulk_insert_rows) == 0) ||
m_primary_key_update ||
set_blob_value) set_blob_value)
{ {
// Send rows to NDB // Send rows to NDB
@ -2115,17 +2116,19 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
if (delete_res) if (delete_res)
{ {
DBUG_PRINT("info", ("delete failed")); DBUG_PRINT("info", ("delete failed"));
// Undo write_row(new_data)
DBUG_RETURN(delete_res); DBUG_RETURN(delete_res);
} }
// Insert new row // Insert new row
DBUG_PRINT("info", ("delete succeded")); DBUG_PRINT("info", ("delete succeded"));
m_primary_key_update= TRUE;
insert_res= write_row(new_data); insert_res= write_row(new_data);
m_primary_key_update= FALSE;
if (insert_res) if (insert_res)
{ {
DBUG_PRINT("info", ("insert failed")); DBUG_PRINT("info", ("insert failed"));
if (trans->commitStatus() == NdbConnection::Started) if (trans->commitStatus() == NdbConnection::Started)
{ {
// Undo write_row(new_data)
m_primary_key_update= TRUE; m_primary_key_update= TRUE;
insert_res= write_row((byte *)old_data); insert_res= write_row((byte *)old_data);
m_primary_key_update= FALSE; m_primary_key_update= FALSE;