From 021c2d45cb521876e16001533ef8f3512dc38531 Mon Sep 17 00:00:00 2001 From: "konstantin@mysql.com" <> Date: Sun, 19 Jun 2005 17:02:31 +0400 Subject: [PATCH] Fix the test for Bug#11111: coding style, a compiler warning, don't use tabs. --- tests/mysql_client_test.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 1cde3a1e978..df268a798e4 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -13151,13 +13151,14 @@ static void test_bug9643() 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 @@ static void test_bug11111() 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"); -- 2.30.9