Merge lp:~mordred/drizzle/bug687582 into lp:drizzle/7.0

[Monty Taylor]

Evan's change for not memsetting column structs.

[Lee Bieber (kalebral-deactivatedaccount)]

Lots of tests output has changed, do test results need updating??

review: Needs Fixing

[Andrew Hutchings (linuxjedi)]

Looks to me like the column length data is getting messed up judging by the test results. I suspect this needs resetting where the memset was.

[Lee Bieber (kalebral-deactivatedaccount)]

Seeing test failure on freebsd - http://hudson.drizzle.org/job/drizzle-build-freebsd-8.0/1088/

review: Needs Fixing

=== modified file 'libdrizzle/column.c'
--- libdrizzle/column.c	2010-12-04 02:13:38 +0000
+++ libdrizzle/column.c	2010-12-10 20:16:11 +0000
@@ -364,11 +364,47 @@
       return NULL;
     }
 
-    memset(column, 0, sizeof(drizzle_column_st));
-    column->options|= DRIZZLE_COLUMN_ALLOCATED;
+    column->result = result;
+    /* SET BELOW: column->next */
+    column->prev = NULL;
+    column->options= DRIZZLE_COLUMN_ALLOCATED;
+    column->catalog[0] = '\0';
+    column->db[0] = '\0';
+    column->table[0] = '\0';
+    column->orig_table[0] = '\0';
+    column->name[0] = '\0';
+    column->orig_name[0] = '\0';
+    column->charset = 0;
+    column->size = 0;
+    column->max_size = 0;
+    column->type = 0;
+    column->flags = 0;
+    column->decimals = 0;
+    /* UNSET: column->default_value */
+    column->default_value_size = 0;
+
   }
   else
-    memset(column, 0, sizeof(drizzle_column_st));
+  {
+    column->result = result;
+    /* SET BELOW: column->next */
+    column->prev = NULL;
+    column->options= 0;
+    column->catalog[0] = '\0';
+    column->db[0] = '\0';
+    column->table[0] = '\0';
+    column->orig_table[0] = '\0';
+    column->name[0] = '\0';
+    column->orig_name[0] = '\0';
+    column->charset = 0;
+    column->size = 0;
+    column->max_size = 0;
+    column->type = 0;
+    column->flags = 0;
+    column->decimals = 0;
+    /* UNSET: column->default_value */
+    column->default_value_size = 0;
+  }
 
   column->result= result;