database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
unknown
2005-08-15 10:18:14 -07:00
parent 4566d12fb8 c1a7cfb7d5
commit 000a09baac
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/metadata.result
View File

@ -85,3 +85,14 @@ def aaa 1 1 8 20 1 N 32769 0 63
1 1
1 1
drop table t1; 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

12
mysql-test/t/metadata.test
View File

@ -49,4 +49,16 @@ drop table t1;
--disable_metadata --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 # End of 4.1 tests

5
sql-common/client.c
View File

@ -713,8 +713,9 @@ void free_old_query(MYSQL *mysql)
if (mysql->fields) if (mysql->fields)
free_root(&mysql->field_alloc,MYF(0)); free_root(&mysql->field_alloc,MYF(0));
init_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */ init_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */
mysql->fields=0; mysql->fields= 0;
mysql->field_count=0; /* For API */ mysql->field_count= 0; /* For API */
mysql->info= 0;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }