← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2010-07-09 20:51:34 UTC
  • mfrom: (1643.4.3 drizzle)
  • Revision ID: brian@gaz-20100709205134-ru4s0889youfrmm5
Merge of Patrick

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
178
178
  if (!fields_vars.elements)
179
179
  {
180
180
    Field **field;
181
 
    for (field=table->field; *field ; field++)
 
181
    for (field= table->getFields(); *field ; field++)
182
182
      fields_vars.push_back(new Item_field(*field));
183
183
    table->setWriteSet();
184
184
    table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
258
258
#endif
259
259
    if (!internal::dirname_length(ex->file_name))
260
260
    {
261
 
      strcpy(name, drizzle_real_data_home);
262
 
      strncat(name, tdb, FN_REFLEN-strlen(drizzle_real_data_home)-1);
 
261
      strcpy(name, data_home_real);
 
262
      strncat(name, tdb, FN_REFLEN-strlen(data_home_real)-1);
263
263
      (void) internal::fn_format(name, ex->file_name, name, "",
264
264
                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
265
265
    }
266
266
    else
267
267
    {
268
 
      (void) internal::fn_format(name, ex->file_name, drizzle_real_data_home, "",
 
268
      (void) internal::fn_format(name, ex->file_name, data_home_real, "",
269
269
                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
270
270
 
271
271
      if (opt_secure_file_priv &&
377
377
    internal::my_close(file,MYF(0));
378
378
  free_blobs(table);                            /* if pack_blob was used */
379
379
  table->copy_blobs=0;
380
 
  session->count_cuted_fields= CHECK_FIELD_IGNORE;
 
380
  session->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL;
381
381
  /*
382
382
     simulated killing in the middle of per-row loop
383
383
     must be effective for binlogging