← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Brian Aker
  • Date: 2009-03-05 07:55:26 UTC
  • mfrom: (910.1.5 drizzle)
  • Revision ID: brian@tangent.org-20090305075526-ua34bjproq6oxujx
Merge of Brian (test extensions, dead code killing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
655
655
    }
656
656
    break;
657
657
  case 'r':
658
 
    if (!(md_result_file= my_fopen(argument, O_WRONLY,
659
 
                                    MYF(MY_WME))))
 
658
    if (!(md_result_file= fopen(argument, "w")))
660
659
      exit(1);
661
660
    break;
662
661
  case 'N':
976
975
  FILE* res;
977
976
  char filename[FN_REFLEN], tmp_path[FN_REFLEN];
978
977
  convert_dirname(tmp_path,path,NULL);
979
 
  res= my_fopen(fn_format(filename, table, tmp_path, ".sql", 4),
980
 
                O_WRONLY, MYF(MY_WME));
 
978
  res= fopen(fn_format(filename, table, tmp_path, ".sql", 4), "w");
 
979
 
981
980
  return res;
982
981
}
983
982
 
985
984
static void free_resources(void)
986
985
{
987
986
  if (md_result_file && md_result_file != stdout)
988
 
    my_fclose(md_result_file, MYF(0));
 
987
    fclose(md_result_file);
989
988
  free(opt_password);
990
989
  if (hash_inited(&ignore_table))
991
990
    hash_free(&ignore_table);
1461
1460
    if (drizzleclient_query_with_error_report(drizzle, &result, query_buff))
1462
1461
    {
1463
1462
      if (path)
1464
 
        my_fclose(sql_file, MYF(MY_WME));
 
1463
        fclose(sql_file);
1465
1464
      return false;
1466
1465
    }
1467
1466
 
1621
1620
        fprintf(stderr, _("%s: Can't get keys for table %s (%s)\n"),
1622
1621
                my_progname, result_table, drizzleclient_error(drizzle));
1623
1622
        if (path)
1624
 
          my_fclose(sql_file, MYF(MY_WME));
 
1623
          fclose(sql_file);
1625
1624
        return false;
1626
1625
      }
1627
1626
 
1739
1738
  {
1740
1739
    fputs("\n", sql_file);
1741
1740
    write_footer(sql_file);
1742
 
    my_fclose(sql_file, MYF(MY_WME));
 
1741
    fclose(sql_file);
1743
1742
  }
1744
1743
  return true;
1745
1744
} /* get_table_structure */