Commit 9aa76331 authored by unknown's avatar unknown
Browse files

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

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
parents dfd38e1d b3dd0029

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=8

NDB_VERSION_BUILD=9

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/r/rpl_insert_ignore.result

0 → 100644
+70 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

CREATE TABLE t1 (

a int unsigned not null auto_increment primary key,

b int unsigned,

unique (b)

) ENGINE=innodb;

CREATE TABLE t2 (

a int unsigned, # to force INSERT SELECT to have a certain order

b int unsigned

) ENGINE=innodb;

INSERT INTO t1 VALUES (NULL, 1);

INSERT INTO t1 VALUES (NULL, 2);

INSERT INTO t1 VALUES (NULL, 3);

INSERT INTO t1 VALUES (NULL, 4);

INSERT INTO t2 VALUES (1, 1);

INSERT INTO t2 VALUES (2, 2);

INSERT INTO t2 VALUES (3, 5);

INSERT INTO t2 VALUES (4, 3);

INSERT INTO t2 VALUES (5, 4);

INSERT INTO t2 VALUES (6, 6);

INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;

SELECT * FROM t1 ORDER BY a;

a	b

1	1

2	2

3	3

4	4

5	5

6	6

SELECT * FROM t1 ORDER BY a;

a	b

1	1

2	2

3	3

4	4

5	5

6	6

drop table t1;

CREATE TABLE t1 (

a int unsigned not null auto_increment primary key,

b int unsigned,

unique (b)

) ENGINE=myisam;

INSERT INTO t1 VALUES (1, 1);

INSERT INTO t1 VALUES (2, 2);

INSERT INTO t1 VALUES (3, 3);

INSERT INTO t1 VALUES (4, 4);

INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;

SELECT * FROM t1 ORDER BY a;

a	b

1	1

2	2

3	3

4	4

5	5

6	6

SELECT * FROM t1 ORDER BY a;

a	b

1	1

2	2

3	3

4	4

5	5

6	6

drop table t1, t2;

mysql-test/t/rpl_insert_ignore-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--innodb

mysql-test/t/rpl_insert_ignore.test

0 → 100644
+71 −0
Original line number Diff line number Diff line 
# Testcase for BUG#6287 "Slave skips auto_increment values in Replication with InnoDB"

# The bug was that if on master, INSERT IGNORE ignored some

# rows, and the table was InnoDB with auto_inc column, then on slave

# some rows received an auto_inc bigger than on master.

# Slave needs to be started with --innodb to store table in InnoDB.

# Same test for MyISAM (which had no bug).



-- source include/have_innodb.inc



-- source include/master-slave.inc



CREATE TABLE t1 (

 a int unsigned not null auto_increment primary key,

 b int unsigned,

 unique (b)

) ENGINE=innodb;



CREATE TABLE t2 (

 a int unsigned, # to force INSERT SELECT to have a certain order

 b int unsigned

) ENGINE=innodb;





INSERT INTO t1 VALUES (NULL, 1);

INSERT INTO t1 VALUES (NULL, 2);

INSERT INTO t1 VALUES (NULL, 3);

INSERT INTO t1 VALUES (NULL, 4);



# An alternation of values which will conflict in t1 and will not.



INSERT INTO t2 VALUES (1, 1);

INSERT INTO t2 VALUES (2, 2);

INSERT INTO t2 VALUES (3, 5);

INSERT INTO t2 VALUES (4, 3);

INSERT INTO t2 VALUES (5, 4);

INSERT INTO t2 VALUES (6, 6);



INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;



# Compare results



SELECT * FROM t1 ORDER BY a;



sync_slave_with_master;

SELECT * FROM t1 ORDER BY a;



# Now do the same for MyISAM



connection master;

drop table t1;

CREATE TABLE t1 (

 a int unsigned not null auto_increment primary key,

 b int unsigned,

 unique (b)

) ENGINE=myisam;



INSERT INTO t1 VALUES (1, 1);

INSERT INTO t1 VALUES (2, 2);

INSERT INTO t1 VALUES (3, 3);

INSERT INTO t1 VALUES (4, 4);



INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;



SELECT * FROM t1 ORDER BY a;



sync_slave_with_master;

SELECT * FROM t1 ORDER BY a;



connection master;

drop table t1, t2;

sync_slave_with_master;

ndb/include/ndbapi/Ndb.hpp

+1 −10
Original line number Diff line number Diff line
@@ -1586,7 +1586,6 @@ private: 
/******************************************************************************

 *	These are the private variables in this class.	

 *****************************************************************************/

  NdbObjectIdMap*       theNdbObjectIdMap;

  Ndb_cluster_connection   *m_ndb_cluster_connection;



  NdbConnection**       thePreparedTransactionsArray;
@@ -1637,10 +1636,6 @@ private: 
  Uint32   theMyRef;        // My block reference  

  Uint32   theNode;         // The node number of our node

  

  Uint32   theNoOfDBnodes;  // The number of DB nodes  

  Uint32 * theDBnodes;      // The node number of the DB nodes

  Uint8    *the_release_ind;// 1 indicates to release all connections to node 

  

  Uint64               the_last_check_time;

  Uint64               theFirstTransId;
@@ -1663,10 +1658,6 @@ private: 
    InitConfigError

  } theInitState;



  // Ensure good distribution of connects

  Uint32		theCurrentConnectIndex;

  Uint32		theCurrentConnectCounter;

  

  /**

   * Computes fragement id for primary key

   *
@@ -1692,7 +1683,7 @@ private: 
    Uint32 noOfFragments;

    Uint32 * fragment2PrimaryNodeMap;

    

    void init(Uint32 noOfNodes, Uint32 nodeIds[]);

    void init(Uint32 noOfNodes, Uint8 nodeIds[]);

    void release();

  } startTransactionNodeSelectionData;