Commit 290d97a2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents db722822 408d069e

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ d date YES NULL 
e	varchar(1)	NO			

f	datetime	YES		NULL	

g	time	YES		NULL	

h	varbinary(23)	NO			

h	longblob	NO			

dd	time	YES		NULL	

select * from t2;

a	b	c	d	e	f	g	h	dd

mysql-test/r/distinct.result

+8 −0
Original line number Diff line number Diff line
@@ -464,3 +464,11 @@ SELECT DISTINCT html,SUM(rout)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin; 
html	prod

1	0.0000

drop table t1;

create table t1 (id int, dsc varchar(50));

insert into t1 values (1, "line number one"), (2, "line number two"), (3, "line number three");

select distinct id, IFNULL(dsc, '-') from t1;

id	IFNULL(dsc, '-')

1	line number one

2	line number two

3	line number three

drop table t1;

mysql-test/r/ndb_subquery.result

+19 −0
Original line number Diff line number Diff line
@@ -40,3 +40,22 @@ p u o 
5	5	5

drop table t1;

drop table t2;

create table t1 (p int not null primary key, u int not null) engine=ndb;

insert into t1 values (1,1),(2,2),(3,3);

create table t2 as 

select t1.*

from t1 as t1, t1 as t2, t1 as t3, t1 as t4, t1 as t5, t1 as t6, t1 as t7, t1 as t8

where t1.u = t2.u

and t2.u = t3.u

and t3.u = t4.u

and t4.u = t5.u

and t5.u = t6.u

and t6.u = t7.u

and t7.u = t8.u;

select * from t2 order by 1;

p	u

1	1

2	2

3	3

drop table t1;

drop table t2;

mysql-test/r/sp-error.result

+14 −0
Original line number Diff line number Diff line
@@ -672,3 +672,17 @@ select default(t30.s1) from t30; 
end|

drop procedure bug10969|

drop table t1|

prepare stmt from "select 1";

create procedure p() deallocate prepare stmt;

ERROR 0A000: DEALLOCATE is not allowed in stored procedures

create function f() returns int begin deallocate prepare stmt;

ERROR 0A000: DEALLOCATE is not allowed in stored procedures

create procedure p() prepare stmt from "select 1";

ERROR 0A000: PREPARE is not allowed in stored procedures

create function f() returns int begin prepare stmt from "select 1";

ERROR 0A000: PREPARE is not allowed in stored procedures

create procedure p() execute stmt;

ERROR 0A000: EXECUTE is not allowed in stored procedures

create function f() returns int begin execute stmt;

ERROR 0A000: EXECUTE is not allowed in stored procedures

deallocate prepare stmt;

mysql-test/r/sp-threads.result

+15 −0
Original line number Diff line number Diff line
@@ -40,3 +40,18 @@ Id User Host db Command Time State Info 
unlock tables;

drop procedure bug9486;

drop table t1, t2;

drop procedure if exists bug11158;

create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;

create table t1 (id int, j int);

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

create table t2 (id int);

insert into t2 values (1);

call bug11158();

select * from t1;

id	j

2	2

lock tables t2 read;

call bug11158();

unlock tables;

drop procedure bug11158;

drop table t1, t2;