start to fix extract vsize

3 files changed, 20 insertions, 12 deletions

diff --git a/src/my/my.c b/src/my/my.c
index ef11fbe74..93b0a05b4 100644
--- a/src/my/my.c
+++ b/src/my/my.c
@@ -175,17 +175,10 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
     }
 
     ret = mysql_stmt_fetch (stmt);
-
-    if (MYSQL_DATA_TRUNCATED == ret)
-    {
-       fprintf(stderr, "Data truncated with error %d \n", ret);
-       fprintf(stderr, "nontruncated length of the parameter values : %d\n", rs[0].mysql_bind_output_length);
-       return GNUNET_SYSERR;
-    }
-    
+   
     if (MYSQL_NO_DATA == ret)
       return GNUNET_NO;
-    if (0 != ret)
+    if ((0 != ret ) & (MYSQL_DATA_TRUNCATED != ret))
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
                        "my",
diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c
index 97cc1f1bf..2d2c18cec 100644
--- a/src/my/my_result_helper.c
+++ b/src/my/my_result_helper.c
@@ -40,7 +40,7 @@ pre_extract_varsize_blob (void *cls,
   results[0].buffer = NULL;
   results[0].buffer_length = 0;
   results[0].length = &rs->mysql_bind_output_length;
-  results[0].buffer_type = MYSQL_TYPE_BLOB;
+ // results[0].buffer_type = MYSQL_TYPE_BLOB;
 
   return GNUNET_OK;
 }
@@ -69,11 +69,16 @@ post_extract_varsize_blob (void *cls,
   size_t size;
 
   size = (size_t) rs->mysql_bind_output_length;
+
   if (rs->mysql_bind_output_length != size)
     return GNUNET_SYSERR; /* 'unsigned long' does not fit in size_t!? */
   buf = GNUNET_malloc (size);
+
   results[0].buffer = buf;
   results[0].buffer_length = size;
+  results[0].buffer_type = MYSQL_TYPE_BLOB;
+
+  fprintf(stderr, "size : %d\n", size);
 
   if (0 !=
       mysql_stmt_fetch_column (stmt,
@@ -84,8 +89,12 @@ post_extract_varsize_blob (void *cls,
     GNUNET_free (buf);
     return GNUNET_SYSERR;
   }
+
+  printf("buf : %s\n", (char*)buf);
+
   *(void **) rs->dst = buf;
   *rs->result_size = size;
+
   return GNUNET_OK;
 }
 
diff --git a/src/my/test_my.c b/src/my/test_my.c
index af15b6ab2..b8b5faf33 100644
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -162,7 +162,7 @@ run_queries (struct GNUNET_MYSQL_Context *context)
                                                                  " abs_time"
                                                                  ",forever"
                                                                  ",hash"
-                                                                 //" vsize"
+                                                                 ",vsize"
                                                                  ",u16"
                                                                  ",u32"
                                                                  ",u64"
@@ -206,7 +206,7 @@ run_queries (struct GNUNET_MYSQL_Context *context)
           GNUNET_MY_result_spec_absolute_time (&abs_time2),
           GNUNET_MY_result_spec_absolute_time (&forever2),
           GNUNET_MY_result_spec_auto_from_type (&hc2),
-          //GNUNET_MY_result_spec_variable_size (&msg2, &msg2_len),
+          GNUNET_MY_result_spec_variable_size (&msg2, &msg2_len),
           GNUNET_MY_result_spec_uint16 (&u162),
           GNUNET_MY_result_spec_uint32 (&u322),
           GNUNET_MY_result_spec_uint64 (&u642),
@@ -224,6 +224,12 @@ run_queries (struct GNUNET_MYSQL_Context *context)
                             &hc2,
                             sizeof (struct GNUNET_HashCode)));
 
+     GNUNET_break (strlen (msg) == msg2_len);
+     GNUNET_break (0 ==
+            strncmp (msg,
+                  msg2,
+                  msg2_len));
+     fprintf(stderr, "msg2 : %d\n", strlen(msg2));
      GNUNET_break (16 == u162);
      GNUNET_break (32 == u322);
      GNUNET_break (64 == u642);