← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

Monty fixes pluss a few from me for charset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
1009
1009
  table_count=  update_tables.size();
1010
1010
 
1011
1011
  tmp_tables = (Table**) session->calloc(sizeof(Table *) * table_count);
1012
 
  tmp_table_param= new Tmp_Table_Param[table_count];
 
1012
  tmp_table_param = (Tmp_Table_Param*) session->calloc(sizeof(Tmp_Table_Param) *
 
1013
                                                   table_count);
1013
1014
  fields_for_table= (List_item **) session->alloc(sizeof(List_item *) *
1014
1015
                                              table_count);
1015
1016
  values_for_table= (List_item **) session->alloc(sizeof(List_item *) *
1228
1229
    {
1229
1230
      if (tmp_tables[cnt])
1230
1231
      {
1231
 
        tmp_tables[cnt]->free_tmp_table(session);
 
1232
        tmp_tables[cnt]->free_tmp_table(session);
 
1233
        tmp_table_param[cnt].cleanup();
1232
1234
      }
1233
1235
    }
1234
1236
  }
1235
 
 
1236
 
  delete [] tmp_table_param;
1237
 
  
1238
1237
  if (copy_field)
1239
1238
    delete [] copy_field;
1240
1239
  session->count_cuted_fields= CHECK_FIELD_IGNORE;              // Restore this setting