← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-1.0/field.cc

Fix merge issues with 1.0 CC fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-1.0/field.cc
93
93
 
94
94
  if (result->field_buffer == NULL)
95
95
  {
96
 
    result->field_buffer= malloc((*total) + 1);
 
96
    result->field_buffer= (drizzle_field_t)malloc((*total) + 1);
97
97
    if (result->field_buffer == NULL)
98
98
    {
99
99
      drizzle_set_error(result->con->drizzle, "drizzle_field_buffer", "malloc");
139
139
  {
140
140
    if (result->options & DRIZZLE_RESULT_ROW_BREAK)
141
141
    {
142
 
      result->options&= (drizzle_result_options_t)~DRIZZLE_RESULT_ROW_BREAK;
 
142
      result->options&= int(~DRIZZLE_RESULT_ROW_BREAK);
143
143
      result->field= field;
144
144
      result->field_size= size;
145
145
    }