← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/csv/ha_tina.cc

  • Committer: Brian Aker
  • Date: 2010-03-19 04:55:01 UTC
  • mfrom: (1358.1.9 build)
  • Revision ID: brian@gaz-20100319045501-2k8uekm12tozsvf1
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/csv/ha_tina.cc
186
186
 
187
187
  for (const char **ext= bas_ext(); *ext ; ext++)
188
188
  {
189
 
    internal::fn_format(buff, identifier.getPath(), "", *ext,
190
 
              MY_UNPACK_FILENAME|MY_APPEND_EXT);
 
189
    internal::fn_format(buff, identifier.getPath().c_str(), "", *ext,
 
190
                        MY_UNPACK_FILENAME|MY_APPEND_EXT);
191
191
    if (internal::my_delete_with_symlink(buff, MYF(0)))
192
192
    {
193
193
      if ((error= errno) != ENOENT)
1418
1418
  }
1419
1419
 
1420
1420
 
1421
 
  if ((create_file= internal::my_create(internal::fn_format(name_buff, identifier.getPath(), "", CSM_EXT,
1422
 
                                        MY_REPLACE_EXT|MY_UNPACK_FILENAME), 0,
1423
 
                              O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
 
1421
  if ((create_file= internal::my_create(internal::fn_format(name_buff, identifier.getPath().c_str(), "", CSM_EXT,
 
1422
                                                            MY_REPLACE_EXT|MY_UNPACK_FILENAME), 0,
 
1423
                                        O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
1424
1424
    return(-1);
1425
1425
 
1426
1426
  write_meta_file(create_file, 0, false);
1427
1427
  internal::my_close(create_file, MYF(0));
1428
1428
 
1429
 
  if ((create_file= internal::my_create(internal::fn_format(name_buff, identifier.getPath(), "", CSV_EXT,
1430
 
                                        MY_REPLACE_EXT|MY_UNPACK_FILENAME),0,
1431
 
                              O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
 
1429
  if ((create_file= internal::my_create(internal::fn_format(name_buff, identifier.getPath().c_str(), "", CSV_EXT,
 
1430
                                                            MY_REPLACE_EXT|MY_UNPACK_FILENAME),0,
 
1431
                                        O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)
1432
1432
    return(-1);
1433
1433
 
1434
1434
  internal::my_close(create_file, MYF(0));