bk commit into 4.1 tree (jimw:1.2371) BUG#11688

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2371 05/08/10 18:32:17 jimw@stripped +3 -0
  Fix mysql_info() returning bad data in the results of a multi-statement
  query that mixed statements that do and do not return info. (Bug #11688)

  sql-common/client.c
    1.86 05/08/10 18:32:14 jimw@stripped +3 -2
    Clear mysql->info in free_old_query()

  mysql-test/t/metadata.test
    1.5 05/08/10 18:32:14 jimw@stripped +12 -0
    Add new regression test

  mysql-test/r/metadata.result
    1.10 05/08/10 18:32:14 jimw@stripped +11 -0
    Add new results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-11688

--- 1.85/sql-common/client.c	2005-07-19 08:31:13 -07:00
+++ 1.86/sql-common/client.c	2005-08-10 18:32:14 -07:00
@@ -713,8 +713,9 @@
   if (mysql->fields)
     free_root(&mysql->field_alloc,MYF(0));
   init_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */
-  mysql->fields=0;
-  mysql->field_count=0;				/* For API */
+  mysql->fields= 0;
+  mysql->field_count= 0;			/* For API */
+  mysql->info= 0;
   DBUG_VOID_RETURN;
 }
 

--- 1.9/mysql-test/r/metadata.result	2005-03-30 12:07:59 -08:00
+++ 1.10/mysql-test/r/metadata.result	2005-08-10 18:32:14 -07:00
@@ -85,3 +85,14 @@
 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

--- 1.4/mysql-test/t/metadata.test	2005-07-27 17:21:44 -07:00
+++ 1.5/mysql-test/t/metadata.test	2005-08-10 18:32:14 -07:00
@@ -49,4 +49,16 @@
 
 --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