Commit d9e7af26 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 8975c9bb e0db2186

client/mysqltest.c

+1 −12
Original line number Diff line number Diff line
@@ -2143,19 +2143,8 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host, 
    *create_conn= 0;

    goto err;

  }

  else

  {

    handle_no_error(q);



    /*

      Fail if there was no error but we expected it.

      We also don't want to have connection in this case.

    */

    mysql_close(con);

    *create_conn= 0;

    error= 1;

    goto err;

  }

  handle_no_error(q);



  /*

   TODO: change this to 0 in future versions, but the 'kill' test relies on

mysql-test/r/mysqltest.result

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ OK 
mysqltest: In included file "./var/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c

mysqltest: In included file "./var/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool

mysqltest: In included file "./var/tmp/con.sql": At line 2: Connection test_con1 already exists

connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);

Output from mysqltest-x.inc

Output from mysqltest-x.inc

Output from mysqltest-x.inc

mysql-test/r/sp-error.result

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ fetch c into v; 
end|

delete from t1|

call bug7299()|

ERROR 02000: No data to FETCH

ERROR 02000: No data - zero rows fetched, selected, or processed

drop procedure bug7299|

create procedure bug9073()

begin

mysql-test/r/sp.result

+8 −8
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ delete from t1| 
create table t3 ( s char(16), d int)|

call into_test4()|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from t3|

s	d

into4	NULL
@@ -1787,10 +1787,10 @@ end| 
call bug1863(10)|

Warnings:

Note	1051	Unknown table 'temp_t1'

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug1863(10)|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from t4|

f1	rc	t3

2	0	NULL
@@ -2084,10 +2084,10 @@ end| 
call bug4579_1()|

call bug4579_1()|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug4579_1()|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

drop procedure bug4579_1|

drop procedure bug4579_2|

drop table t3|
@@ -2566,7 +2566,7 @@ call bug7743("OneWord")| 
var

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug7743("anotherword")|

var

2
@@ -2574,7 +2574,7 @@ call bug7743("AnotherWord")| 
var

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

drop procedure bug7743|

drop table t4|

delete from t3|
@@ -4496,7 +4496,7 @@ After NOT FOUND condtition is triggered 
xid	xdone

1	0

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug15231_3()|

Result

Missed it (correct)

mysql-test/r/type_decimal.result

+0 −13
Original line number Diff line number Diff line
@@ -772,16 +772,3 @@ productid zlevelprice 
003trans	39.98

004trans	31.18

drop table t1, t2;
 
create table t1 (a double(53,0));

insert into t1 values (9988317491112007680) ,(99883133042600208184115200);

select a from t1;

a

9988317491112007680

99883133042600208184115200

truncate t1;

insert into t1 values (9988317491112007680.0) ,(99883133042600208184115200.0);

select a from t1;

a

9988317491112007680

99883133042600208184115200

drop table t1;