Commit 89001262 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 4e6177d8 9a8d59b0

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ pager: 
hours: 

[serg:]checkout:get

[arjen:]checkout:get

[kostja:]checkout:get

[nick:]checkout:get

checkout:edit

eoln:unix

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ kaa@polly.local 
kaj@work.mysql.com

kent@mysql.com

konstantin@mysql.com

kosipov@production.mysql.com

kostja@oak.local

lars@mysql.com

lenz@kallisto.mysql.com

libmysql/errmsg.c

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ const char *client_errors[]= 
  "Row retrieval was canceled by mysql_stmt_close() call",

  "Attempt to read column without prior row fetch",

  "Prepared statement contains no metadata",

  "Attempt to read a row while there is no result set associated with the statement"

  "Attempt to read a row while there is no result set associated with the statement",

  ""

};
@@ -142,7 +142,7 @@ const char *client_errors[]= 
  "Row retrieval was canceled by mysql_stmt_close() call",

  "Attempt to read column without prior row fetch",

  "Prepared statement contains no metadata",

  "Attempt to read a row while there is no result set associated with the statement"

  "Attempt to read a row while there is no result set associated with the statement",

  ""

};
@@ -202,7 +202,7 @@ const char *client_errors[]= 
  "Row retrieval was canceled by mysql_stmt_close() call",

  "Attempt to read column without prior row fetch",

  "Prepared statement contains no metadata",

  "Attempt to read a row while there is no result set associated with the statement"

  "Attempt to read a row while there is no result set associated with the statement",

  ""

};

#endif

mysql-test/r/sp.result

+25 −0
Original line number Diff line number Diff line
@@ -3073,4 +3073,29 @@ update v1 set data = 10| 
call bug9841()|

drop view v1|

drop procedure bug9841|

drop procedure if exists bug5963|

create procedure bug5963_1 () begin declare v int; set v = (select s1 from t3); select v; end;|

create table t3 (s1 int)|

insert into t3 values (5)|

call bug5963_1()|

v

5

call bug5963_1()|

v

5

drop procedure bug5963_1|

drop table t3|

create procedure bug5963_2 (cfk_value int) 

begin 

if cfk_value in (select cpk from t3) then 

set @x = 5; 

end if; 

end; 

|

create table t3 (cpk int)|

insert into t3 values (1)|

call bug5963_2(1)|

call bug5963_2(1)|

drop procedure bug5963_2|

drop table t3|

drop table t1,t2;

mysql-test/r/type_newdecimal.result

+9 −0
Original line number Diff line number Diff line
@@ -876,3 +876,12 @@ SELECT * FROM t1; 
f1	f2

9999999999999999999999999999999999.00000000000000000000	0.00

DROP TABLE t1;

CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;

INSERT INTO t1 (GRADE) VALUES (151),(252),(343);

SELECT GRADE  FROM t1 WHERE GRADE > 160 AND GRADE < 300;

GRADE

252

SELECT GRADE  FROM t1 WHERE GRADE= 151;

GRADE

151

DROP TABLE t1;