Merge lp:~linuxjedi/libdrizzle/5.1-fixes into lp:libdrizzle

[Andrew Hutchings]

Fixes the following things:
1. Compile error in Ubuntu 13.04
2. Row allocation clearer and wastes less memory (at a later date we should probably make field_t a struct of data and length to improve this further)
3. Remove unnecessary push/pop in field code

=== modified file 'libdrizzle/field.cc'
--- libdrizzle/field.cc	2013-04-24 18:42:59 +0000
+++ libdrizzle/field.cc	2013-04-25 09:08:32 +0000
@@ -285,9 +285,7 @@
     }
     else
     {
-      con->pop_state();
       con->push_state(drizzle_state_packet_read);
-      con->push_state(drizzle_state_field_read);
     }
   }
 
 
=== modified file 'libdrizzle/result.cc'
--- libdrizzle/result.cc	2013-03-11 18:10:23 +0000
+++ libdrizzle/result.cc	2013-04-25 09:08:32 +0000
@@ -101,6 +101,7 @@
       {
         delete[] result->null_bitmap_list[x];
       }
+      delete[] result->field_sizes_list[x];
     }
     if (result->null_bitmap_list != NULL)
     {
 
=== modified file 'libdrizzle/row.cc'
--- libdrizzle/row.cc	2013-04-22 19:14:35 +0000
+++ libdrizzle/row.cc	2013-04-25 09:08:32 +0000
@@ -106,7 +106,7 @@
       return NULL;
     }
 
-    result->row= new (std::nothrow) drizzle_field_t[sizeof(size_t) * result->column_count];
+    result->row= new (std::nothrow) drizzle_field_t[result->column_count];
     if (result->row == NULL)
     {
       drizzle_set_error(result->con, __func__, "Failed to allocate.");
@@ -114,7 +114,13 @@
       return NULL;
     }
 
-    result->field_sizes= (size_t *)(result->row + result->column_count);
+    result->field_sizes= new (std::nothrow) size_t[result->column_count];
+    if (result->field_sizes == NULL)
+    {
+      drizzle_set_error(result->con, __func__, "Failed to allocate.");
+      *ret_ptr= DRIZZLE_RETURN_MEMORY;
+      return NULL;
+    }
   }
 
   while (1)
@@ -128,6 +134,7 @@
       if (*ret_ptr != DRIZZLE_RETURN_IO_WAIT)
       {
         delete[] result->row;
+        delete[] result->field_sizes;
         result->row= NULL;
         result->field_sizes= NULL;
       }
@@ -164,6 +171,8 @@
   { 
     delete[] result->null_bitmap;
     result->null_bitmap= NULL;
+    delete[] result->field_sizes;
+    result->field_sizes= NULL;
   } 
 
   delete[] row;
 
=== modified file 'libdrizzle/statement_param.cc'
--- libdrizzle/statement_param.cc	2013-04-24 18:42:59 +0000
+++ libdrizzle/statement_param.cc	2013-04-25 09:08:32 +0000
@@ -56,7 +56,7 @@
   }
 
   stmt->query_params[param_num].type= type;
-  stmt->query_params[param_num].data= data;
+  stmt->query_params[param_num].data= (void*)data;
   stmt->query_params[param_num].length= length;
   stmt->query_params[param_num].options.is_unsigned= is_unsigned;
   stmt->query_params[param_num].is_bound= true;