Commit 0ca0887b authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
parents 8f755453 a1368c8e

mysql-test/ndb/ndbcluster.sh

+1 −1
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ if [ -d ../sql ] ; then 
   exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd

   exec_waiter=$ndbtop/tools/ndb_waiter

   exec_test=$ndbtop/tools/ndb_test_platform

   exec_test_ndberror=

   exec_test_ndberror=$ndbtop/src/ndbapi/ndberror_check

   exec_mgmtclient=$ndbtop/src/mgmclient/ndb_mgm

else

   BINARY_DIST=1

   if test -x "$BASEDIR/libexec/ndbd"

mysql-test/r/rpl_ndb_sync.result

+4 −4
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ hex(c2) hex(c3) c1 
0	1	BCDEF

1	0	CD

0	0	DEFGHIJKL

SELECT @the_epoch:=MAX(epoch) FROM mysql.apply_status;

SELECT @the_epoch:=MAX(epoch) FROM mysql.ndb_apply_status;

@the_epoch:=MAX(epoch)

<the_epoch>

SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)

FROM mysql.binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;

FROM mysql.ndb_binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;

@the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)

<the_pos>	master-bin.000001

CHANGE MASTER TO
@@ -89,8 +89,8 @@ hex(c2) hex(c3) c1 
DROP DATABASE ndbsynctest;

STOP SLAVE;

reset master;

select * from mysql.binlog_index;

select * from mysql.ndb_binlog_index;

Position	File	epoch	inserts	updates	deletes	schemaops

reset slave;

select * from mysql.apply_status;

select * from mysql.ndb_apply_status;

server_id	epoch

mysql-test/r/trigger.result

+6 −5
Original line number Diff line number Diff line
@@ -1398,18 +1398,19 @@ id val 
1	test1

2	test2

INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val);

INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);

INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);

INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val);

SELECT * FROM t1;

id	val

1	test1

2	test2

3	test3

2	test3

3	test4

SELECT * FROM t2;

id	val

1	test1

2	test2

3	test2

4	test3

3	test3

4	test4

DROP TRIGGER trg27006_a_insert;

DROP TRIGGER trg27006_a_update;

drop table t1,t2;

mysql-test/t/disabled.def

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random 
ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed

ndb_restore_partition    : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone

rpl_ndb_sync             : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone



partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table

rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
@@ -37,5 +35,4 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb 


plugin                   : Bug#25659 memory leak via "plugins" test

rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly

ndb_alter_table		 : Bug##25774 ndb_alter_table.test fails in DBUG_ASSERT() on Linux x64

ndb_single_user          : Bug#27021 Error codes in mysqld in single user mode varies

mysql-test/t/trigger.test

+3 −3
Original line number Diff line number Diff line
@@ -1700,8 +1700,7 @@ DROP PROCEDURE bug22580_proc_1; 
DROP PROCEDURE bug22580_proc_2;



#

# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY

#            UPDATE if the row wasn't actually changed.

# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE

#

--disable_warnings

DROP TRIGGER IF EXISTS trg27006_a_update;
@@ -1730,7 +1729,8 @@ INSERT INTO t1(val) VALUES ('test1'),('test2'); 
SELECT * FROM t1;

SELECT * FROM t2;

INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val);

INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);

INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);

INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val);

SELECT * FROM t1;

SELECT * FROM t2;

DROP TRIGGER trg27006_a_insert;