Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged mysql-test/r/ndb_update.result: Using local, will regenerate
This commit is contained in:
commit
a6a0aa4236
@ -29,6 +29,7 @@ UPDATE IGNORE t1 set pk1 = 4 where pk1 = 2;
|
|||||||
select * from t1 order by pk1;
|
select * from t1 order by pk1;
|
||||||
-- error 1062
|
-- error 1062
|
||||||
UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
|
UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
|
||||||
|
UPDATE IGNORE t1 set pk1 = 1, c = 2 where pk1 = 4;
|
||||||
select * from t1 order by pk1;
|
select * from t1 order by pk1;
|
||||||
UPDATE t1 set pk1 = pk1 + 10;
|
UPDATE t1 set pk1 = pk1 + 10;
|
||||||
select * from t1 order by pk1;
|
select * from t1 order by pk1;
|
||||||
|
@ -2758,6 +2758,21 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
|
|||||||
DBUG_ENTER("update_row");
|
DBUG_ENTER("update_row");
|
||||||
m_write_op= TRUE;
|
m_write_op= TRUE;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If IGNORE the ignore constraint violations on primary and unique keys
|
||||||
|
*/
|
||||||
|
if (m_ignore_dup_key)
|
||||||
|
{
|
||||||
|
int peek_res= peek_indexed_rows(new_data);
|
||||||
|
|
||||||
|
if (!peek_res)
|
||||||
|
{
|
||||||
|
DBUG_RETURN(HA_ERR_FOUND_DUPP_KEY);
|
||||||
|
}
|
||||||
|
if (peek_res != HA_ERR_KEY_NOT_FOUND)
|
||||||
|
DBUG_RETURN(peek_res);
|
||||||
|
}
|
||||||
|
|
||||||
statistic_increment(thd->status_var.ha_update_count, &LOCK_status);
|
statistic_increment(thd->status_var.ha_update_count, &LOCK_status);
|
||||||
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
|
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user