From: Date: February 15 2006 8:22pm
Subject: bk commit into 5.1 tree (jimw:1.2112)
List-Archive: http://lists.mysql.com/commits/2672
Message-Id: <20060215192209.780D4A8387@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
5.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.2112 06/02/15 11:22:03 jimw@stripped +3 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-clean
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  tests/mysql_client_test.c
    1.177 06/02/15 11:21:58 jimw@stripped +0 -0
    Auto merged

  libmysql/libmysql.c
    1.236 06/02/15 11:21:58 jimw@stripped +0 -0
    Auto merged

  client/mysqldump.c
    1.224 06/02/15 11:21:58 jimw@stripped +0 -0
    Auto merged

# 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-5.1-clean/RESYNC

--- 1.235/libmysql/libmysql.c	2006-02-14 15:01:34 -08:00
+++ 1.236/libmysql/libmysql.c	2006-02-15 11:21:58 -08:00
@@ -2002,6 +2002,7 @@
   stmt->mysql= mysql;
   stmt->read_row_func= stmt_read_row_no_result_set;
   stmt->prefetch_rows= DEFAULT_PREFETCH_ROWS;
+  strmov(stmt->sqlstate, not_error_sqlstate);
   /* The rest of statement members was bzeroed inside malloc */
 
   DBUG_RETURN(stmt);

--- 1.176/tests/mysql_client_test.c	2006-02-14 15:01:29 -08:00
+++ 1.177/tests/mysql_client_test.c	2006-02-15 11:21:58 -08:00
@@ -14729,6 +14729,21 @@
   client_connect(0);
 }
 
+/* Bug #16143: mysql_stmt_sqlstate returns an empty string instead of '00000' */
+
+static void test_bug16143()
+{
+  MYSQL_STMT *stmt;
+  myheader("test_bug16143");
+
+  stmt= mysql_stmt_init(mysql);
+  /* Check mysql_stmt_sqlstate return "no error" */
+  DIE_UNLESS(strcmp(mysql_stmt_sqlstate(stmt), "00000") == 0);
+
+  mysql_stmt_close(stmt);
+}
+
+
 /* Bug #16144: mysql_stmt_attr_get type error */
 
 static void test_bug16144()
@@ -15072,6 +15087,7 @@
   { "test_opt_reconnect", test_opt_reconnect },
   { "test_bug15510", test_bug15510},
   { "test_bug12744", test_bug12744 },
+  { "test_bug16143", test_bug16143 },
   { "test_bug16144", test_bug16144 },
   { "test_bug15613", test_bug15613 },
   { 0, 0 }