List:Commits« Previous MessageNext Message »
From:Georg Richter Date:October 12 2010 6:55am
Subject:bzr commit into libmysql branch (georg.richter:2911)
View as plain text  
#At file:///home/georg/work/mysql/connectors/connector-c/ based on revid:georg.richter@stripped

 2911 Georg Richter	2010-10-12
      - close default connection in tests
      - send trace data for mysql_use_result 

    modified:
      libmysql/libmysql.c
      unittest/libmysql/charset.c
      unittest/libmysql/my_test.h
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2010-02-16 15:55:45 +0000
+++ b/libmysql/libmysql.c	2010-10-12 06:55:07 +0000
@@ -4921,7 +4921,9 @@ int STDCALL mysql_stmt_next_result(MYSQL
 
 MYSQL_RES * STDCALL mysql_use_result(MYSQL *mysql)
 {
-  return (*mysql->methods->use_result)(mysql);
+  MYSQL_RES *result= (*mysql->methods->use_result)(mysql);
+  MYSQL_TRACE_SEND(MYSQL_TRACE_CMD_STORE_RESULT, mysql, NULL, result, NULL, 0);
+  return result;
 }
 
 my_bool STDCALL mysql_read_query_result(MYSQL *mysql)

=== modified file 'unittest/libmysql/charset.c'
--- a/unittest/libmysql/charset.c	2010-09-23 07:11:46 +0000
+++ b/unittest/libmysql/charset.c	2010-10-12 06:55:07 +0000
@@ -338,6 +338,7 @@ static int test_ps_i18n(MYSQL *mysql)
   rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
   check_stmt_rc(rc, stmt);
   mysql_stmt_bind_param(stmt, bind_array);
+  check_stmt_rc(rc, stmt);
 
   mysql_stmt_send_long_data(stmt, 0, koi8, strlen(koi8));
 

=== modified file 'unittest/libmysql/my_test.h'
--- a/unittest/libmysql/my_test.h	2010-09-23 07:11:46 +0000
+++ b/unittest/libmysql/my_test.h	2010-10-12 06:55:07 +0000
@@ -469,6 +469,8 @@ void run_tests(struct my_tests_st *test)
       skip(1, test[i].skipmsg);
     }
   }
+  if (mysql_default)
+    mysql_close(mysql_default);
   mysql_library_end();
 }
 


Attachment: [text/bzr-bundle] bzr/georg.richter@sun.com-20101012065507-o86xomkrz49fzh7w.bundle
Thread
bzr commit into libmysql branch (georg.richter:2911) Georg Richter12 Oct