bk commit into 5.0 tree (andrey:1.1921) BUG#11183

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey 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.1921 05/07/14 12:20:58 andrey@lmy004. +2 -0
  test case for bug #11183 mysql_stmt_resest() does not reset information about error.
  I wasn't able to plug it in into Changeset 1.1919 therefore it goes into a separate one.

  tests/mysql_client_test.c
    1.134 05/07/14 12:20:45 andrey@lmy004. +48 -0
    test case for bug #11183 mysql_stmt_resest() does not reset information about error.

  libmysql/libmysql.c
    1.225 05/07/14 12:20:44 andrey@lmy004. +1 -1
    from the test ignore changeset

# 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:	andrey
# Host:	lmy004.
# Root:	/home/andrey/mysql-5.0

--- 1.224/libmysql/libmysql.c	2005-07-13 17:31:51 +02:00
+++ 1.225/libmysql/libmysql.c	2005-07-14 12:20:44 +02:00
@@ -11,7 +11,7 @@
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details. 
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

--- 1.133/tests/mysql_client_test.c	2005-07-13 08:49:45 +02:00
+++ 1.134/tests/mysql_client_test.c	2005-07-14 12:20:45 +02:00
@@ -13654,6 +13654,53 @@
 }
 
 
+static void test_bug11183()
+{
+  int rc;
+  MYSQL_STMT    * stmt;
+  char          bug_statement[] = "insert into bug111813 values (1)";
+
+  myheader("test_bug11183");
+
+
+  
+  mysql_query(mysql, "drop table bug111813 if exists");
+  mysql_query(mysql, "create table bug111813(a int)");
+  
+  stmt= mysql_stmt_init(mysql);
+  DIE_UNLESS(stmt != 0);
+
+  rc= mysql_stmt_prepare(stmt, bug_statement, strlen(bug_statement));
+  DIE_UNLESS(rc==0);
+
+  rc= mysql_query(mysql, "drop table bug111813");
+  DIE_UNLESS(rc==0);
+
+  /* Trying to execute statement that should fail on execute stage */
+  if (mysql_stmt_execute(stmt))
+  {
+    mysql_stmt_reset(stmt);
+    DIE_UNLESS(mysql_stmt_errno(stmt) == 0);
+  } else
+    DIE_UNLESS(0);
+  
+
+  mysql_query(mysql, "create table bug111813(a int)");
+
+  /* Trying to execute statement that should pass ok */
+  if (mysql_stmt_execute(stmt))
+  {
+    mysql_stmt_reset(stmt);
+    DIE_UNLESS(mysql_stmt_errno(stmt) == 0);
+  }
+
+  rc= mysql_query(mysql, "drop table bug111813");
+  DIE_UNLESS(rc==0);
+
+  mysql_stmt_close(stmt);
+}
+
+
 /*
   Read and parse arguments and MySQL options from my.cnf
 */
@@ -13895,6 +13942,7 @@
   { "test_bug11172", test_bug11172 },
   { "test_bug11656", test_bug11656 },
   { "test_bug10214", test_bug10214 },
+  { "test_bug11183", test_bug11183 },
   { 0, 0 }
 };