bk commit into 5.0 tree (konstantin:1.1955) BUG#11111

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.1955 05/06/19 17:02:31 konstantin@stripped +1 -0
  Fix the test for Bug#11111: coding style, a compiler warning, don't
  use tabs.

  tests/mysql_client_test.c
    1.126 05/06/19 17:02:25 konstantin@stripped +16 -12
    Fix the test for Bug#11111: coding style, a compiler warning, don't
    use tabs.

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.125/tests/mysql_client_test.c	2005-06-17 23:26:19 +04:00
+++ 1.126/tests/mysql_client_test.c	2005-06-19 17:02:25 +04:00
@@ -13151,13 +13151,14 @@
 
 static void test_bug11111()
 {
-  MYSQL_STMT 	*stmt;
-  MYSQL_BIND	bind[2];
-  char		buf[2][20];
-  long		len[2];
+  MYSQL_STMT    *stmt;
+  MYSQL_BIND    bind[2];
+  char          buf[2][20];
+  ulong         len[2];
   int i;
   int rc;
-  const char * query = "SELECT DISTINCT f1,ff2 FROM v1";
+  const char *query= "SELECT DISTINCT f1,ff2 FROM v1";
+
   myheader("test_bug11111");
 
   rc= mysql_query(mysql, "drop table if exists t1, t2, v1");
@@ -13175,24 +13176,27 @@
   rc= mysql_query(mysql, "insert into t2 values (1,1), (2,2), (3,3)");
   myquery(rc);
 
-  stmt = mysql_stmt_init(mysql);
+  stmt= mysql_stmt_init(mysql);
 
   mysql_stmt_prepare(stmt, query, strlen(query));
   mysql_stmt_execute(stmt);
 
-  for (i=0; i < 2; i++) {
-    memset(&bind[i], '\0', sizeof(MYSQL_BIND));
+  bzero(bind, sizeof(bind));
+  for (i=0; i < 2; i++)
+  {
     bind[i].buffer_type= MYSQL_TYPE_STRING;
     bind[i].buffer= (gptr *)&buf[i];
     bind[i].buffer_length= 20;
     bind[i].length= &len[i];
   }
 
-  if (mysql_stmt_bind_result(stmt, bind))
-    printf("Error: %s\n", mysql_stmt_error(stmt));
+  rc= mysql_stmt_bind_result(stmt, bind);
+  check_execute(stmt, rc);
 
-  mysql_stmt_fetch(stmt);
-  printf("return: %s", buf[1]);
+  rc= mysql_stmt_fetch(stmt);
+  check_execute(stmt, rc);
+  if (!opt_silent)
+    printf("return: %s", buf[1]);
   DIE_UNLESS(!strcmp(buf[1],"1"));
   mysql_stmt_close(stmt);
   rc= mysql_query(mysql, "drop view v1");