Commit 9875df86 authored by unknown's avatar unknown
Browse files

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
parents 6d7a573b 95b33450

mysql-test/r/rpl_ndb_do_table.result

+4 −0
Original line number Diff line number Diff line
@@ -19,4 +19,8 @@ t1 
SELECT COUNT(*) FROM t1;

COUNT(*)

3

INSERT INTO t1 VALUES (3, repeat('bad',1));

ERROR 23000: Duplicate entry '3' for key 'PRIMARY'

INSERT INTO t1 VALUES (3, repeat('bad too',1));

ERROR 23000: Duplicate entry '3' for key 'PRIMARY'

DROP TABLE IF EXISTS t1, t2;

mysql-test/t/rpl_ndb_do_table.test

+14 −0
Original line number Diff line number Diff line
@@ -27,6 +27,20 @@ INSERT INTO t2 VALUES(3, repeat('ghi',3000)); 
SHOW TABLES;

SELECT COUNT(*) FROM t1;



#

# Bug #27044 replicated with unique field ndb table allows dup key inserts

#

connection master;



--error ER_DUP_ENTRY_WITH_KEY_NAME

INSERT INTO t1 VALUES (3, repeat('bad',1));



connection slave;

--error ER_DUP_ENTRY_WITH_KEY_NAME

INSERT INTO t1 VALUES (3, repeat('bad too',1));



# cleanup



connection master;

DROP TABLE IF EXISTS t1, t2;

--sync_slave_with_master

sql/ha_ndbcluster.cc

+6 −0
Original line number Diff line number Diff line
@@ -3893,6 +3893,12 @@ int ha_ndbcluster::reset() 
  */

  if (m_part_info)

    bitmap_set_all(&m_part_info->used_partitions);



  /* reset flags set by extra calls */

  m_ignore_dup_key= FALSE;

  m_use_write= FALSE;

  m_ignore_no_key= FALSE;



  DBUG_RETURN(0);

}