summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2004-12-15 01:37:22 +0300
committerunknown <konstantin@mysql.com>2004-12-15 01:37:22 +0300
commit83fce55a3ae79c0033e372cb7ec48a3248307d6e (patch)
treef6691f78f66d284205393bb523fdc5586ae82c81 /tests
parentd9b62f824b15803a1474e29314967b5118481b5f (diff)
downloadmariadb-git-83fce55a3ae79c0033e372cb7ec48a3248307d6e.tar.gz
A fix of return value of mysql_stmt_bind_result() and cleanup.
include/errmsg.h: New libmysql error status code CR_NO_STMT_METADATA libmysql/errmsg.c: Error message for CR_STMT_NO_METADATA. Adding an empty line to shorten further diffs when new error messages are added (as suggested by Monty). libmysql/libmysql.c: Return error from mysql_stmt_bind_result() if the statement contains no metadata. A few comments fixed. tests/client_test.c: Tests fixed: mysql_stmt_bind_result now returns error if there is no metadata.
Diffstat (limited to 'tests')
-rw-r--r--tests/client_test.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/client_test.c b/tests/client_test.c
index b78339cc9bb..fb130a17361 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -5636,9 +5636,6 @@ static void test_subselect()
rc= mysql_stmt_bind_param(stmt, bind);
check_execute(stmt, rc);
- rc= mysql_stmt_bind_result(stmt, bind);
- check_execute(stmt, rc);
-
id= 2;
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
@@ -5982,7 +5979,7 @@ static void test_pure_coverage()
check_execute(stmt, rc);
rc= mysql_stmt_bind_result(stmt, (MYSQL_BIND*)0);
- check_execute(stmt, rc);
+ DIE_UNLESS(rc == 1);
mysql_stmt_close(stmt);