Commit 000a09ba authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-11688 

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents 4566d12f c1a7cfb7

mysql-test/r/metadata.result

+11 −0
Original line number Diff line number Diff line
@@ -85,3 +85,14 @@ def aaa 1 1 8 20 1 N 32769 0 63 
1

1

drop table t1;

create table t1 (i int);

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

select * from t1 where i = 2;

drop table t1;//

affected rows: 0

affected rows: 3

info: Records: 3  Duplicates: 0  Warnings: 0

i

2

affected rows: 1

affected rows: 0

mysql-test/t/metadata.test

+12 −0
Original line number Diff line number Diff line
@@ -49,4 +49,16 @@ drop table t1; 


--disable_metadata



#

# Bug #11688: Bad mysql_info() results in multi-results

#

--enable_info

delimiter //;

create table t1 (i int);

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

select * from t1 where i = 2;

drop table t1;//

delimiter ;//

--disable_info



# End of 4.1 tests

sql-common/client.c

+3 −2
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ void free_old_query(MYSQL *mysql) 
  init_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */

  mysql->fields= 0;

  mysql->field_count= 0;			/* For API */

  mysql->info= 0;

  DBUG_VOID_RETURN;

}