Commit 0b1d727b authored by gni@dev3-221.dev.cn.tlan's avatar gni@dev3-221.dev.cn.tlan
Browse files

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj
parents a021330f b5368c1b

mysql-test/r/bdb_notembedded.result

0 → 100644
+35 −0
Original line number Diff line number Diff line 
set autocommit=1;

reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

drop table bug16206;

reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb

f	n	Query	1	n	use `test`; insert into bug16206 values(0)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; BEGIN

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

f	n	Query	1	n	use `test`; COMMIT

f	n	Query	1	n	use `test`; insert into bug16206 values(3)

drop table bug16206;

set autocommit=0;

End of 5.0 tests

mysql-test/r/ndb_alter_table2.result

+19 −0
Original line number Diff line number Diff line
@@ -40,3 +40,22 @@ a b c 
select * from t1;

a	b	c

drop table t1;

DROP TABLE IF EXISTS truncate_test;

CREATE TABLE truncate_test (

i INT PRIMARY KEY,

a INT,

b VARCHAR(11),

UNIQUE KEY (a) 

) ENGINE = NDB;

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

TRUNCATE truncate_test;

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

SELECT * FROM truncate_test;

i	a	b

1	1	test

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

SELECT * FROM truncate_test;

i	a	b

1	1	new

DROP TABLE truncate_test;

mysql-test/r/view.result

+4 −4
Original line number Diff line number Diff line
@@ -2720,12 +2720,12 @@ View Create View 
v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(`t1`.`test_date`) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75)

SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75;

Age

43

39

44

40

SELECT * FROM v1;

Age

43

39

44

40

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');

mysql-test/t/bdb_notembedded.test

0 → 100644
+38 −0
Original line number Diff line number Diff line 
-- source include/not_embedded.inc

-- source include/have_bdb.inc



#

# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode

#

set autocommit=1;



let $VERSION=`select version()`;



reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



set autocommit=0;





--echo End of 5.0 tests

mysql-test/t/ndb_alter_table2.test

+31 −0
Original line number Diff line number Diff line
@@ -81,3 +81,34 @@ select * from t1; 
select * from t1;



drop table t1;



#For BUG#29851 TRUNCATE causes error 4350 from cluster in INSERT... ON DUPLICATE KEY UPDATE



connection con1;



--disable_warnings

DROP TABLE IF EXISTS truncate_test;

--enable_warnings



CREATE TABLE truncate_test (

  i INT PRIMARY KEY,

  a INT,

  b VARCHAR(11),

  UNIQUE KEY (a) 

) ENGINE = NDB;



INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';



connection con2;

TRUNCATE truncate_test;



connection con1;

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

SELECT * FROM truncate_test;



connection con2;

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

SELECT * FROM truncate_test;



DROP TABLE truncate_test;