Commit 36bfd749 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
sql/ha_ndbcluster.h:
  SCCS merged
parents c7766a95 76d98963

mysql-test/r/heap.result

+2 −2
Original line number Diff line number Diff line
@@ -702,11 +702,11 @@ insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd 
ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1

drop table t1;

CREATE TABLE t1 (a int, key(a)) engine=heap;

insert delayed into t1 values (0);

insert into t1 values (0);

delete from t1;

select * from t1;

a

insert delayed into t1 values (0), (1);

insert into t1 values (0), (1);

select * from t1 where a = 0;

a

0

mysql-test/r/kill.result

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ select ((@id := kill_id) - kill_id) from t3; 
((@id := kill_id) - kill_id)

0

kill @id;

ERROR 08S01: Server shutdown in progress

Got one of the listed errors

drop table t1, t2, t3;

select get_lock("a", 10);

get_lock("a", 10)

mysql-test/r/ndb_basic.result

+55 −0
Original line number Diff line number Diff line
@@ -678,6 +678,61 @@ CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb; 
select * from t1;

b

drop table t1;

create table t1 (a int) engine=ndb;

create table t2 (a int) engine=ndb;

insert into t1 values (1);

insert into t2 values (1);

delete t1.* from t1, t2 where t1.a = t2.a;

select * from t1;

a

select * from t2;

a

1

drop table t1;

drop table t2;

CREATE TABLE t1 (

i   INT,

j   INT,

x   INT,

y   INT,

z   INT

) engine=ndb;

CREATE TABLE t2 (

i   INT,

k   INT,

x   INT,

y   INT,

z   INT

) engine=ndb;

CREATE TABLE t3 (

j   INT,

k   INT,

x   INT,

y   INT,

z   INT

) engine=ndb;

INSERT INTO t1 VALUES ( 1, 2,13,14,15);

INSERT INTO t2 VALUES ( 1, 3,23,24,25);

INSERT INTO t3 VALUES ( 2, 3, 1,34,35), ( 2, 3, 1,34,36);

UPDATE      t1 AS a

INNER JOIN  t2 AS b

ON a.i = b.i

INNER JOIN  t3 AS c

ON a.j = c.j  AND  b.k = c.k

SET         a.x = b.x,

a.y = b.y,

a.z = (

SELECT  sum(z)

FROM    t3

WHERE   y = 34

)

WHERE       b.x = 23;

select * from t1;

i	j	x	y	z

1	2	23	24	71

drop table t1;

drop table t2;

drop table t3;

create table atablewithareallylongandirritatingname (a int);

insert into atablewithareallylongandirritatingname values (2);

select * from atablewithareallylongandirritatingname;

mysql-test/t/heap.test

+2 −2
Original line number Diff line number Diff line
@@ -440,10 +440,10 @@ drop table t1; 
# Bug 12796: Record doesn't show when selecting through index

#

CREATE TABLE t1 (a int, key(a)) engine=heap;

insert delayed into t1 values (0);

insert into t1 values (0);

delete from t1;

select * from t1;

insert delayed into t1 values (0), (1);

insert into t1 values (0), (1);

select * from t1 where a = 0;

drop table t1;

mysql-test/t/kill.test

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ select ((@id := kill_id) - kill_id) from t3; 
kill @id;



connection conn1;

-- error 1053

-- error 1053,2013

reap;



connection default;