← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Brian Aker
  • Date: 2008-10-10 07:00:22 UTC
  • mfrom: (492.1.15 codestyle)
  • Revision ID: brian@tangent.org-20081010070022-aud6tq3a82emaujj
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
1374
1374
  char temp_file_path[FN_REFLEN];
1375
1375
 
1376
1376
  if ((fd= create_temp_file(temp_file_path, NULL,
1377
 
                            "tmp", O_CREAT | O_SHARE | O_RDWR,
 
1377
                            "tmp", O_CREAT | O_RDWR,
1378
1378
                            MYF(MY_WME))) < 0)
1379
1379
    die("Failed to create temporary file for ds");
1380
1380
 
2041
2041
  if (cur_file == file_stack_end)
2042
2042
    die("Source directives are nesting too deep");
2043
2043
  cur_file++;
2044
 
  if (!(cur_file->file = my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))
 
2044
  if (!(cur_file->file = my_fopen(buff, O_RDONLY, MYF(0))))
2045
2045
  {
2046
2046
    cur_file--;
2047
2047
    die("Could not open '%s' for reading", buff);
2897
2897
 
2898
2898
  /* Create temporary file name */
2899
2899
  if ((fd= create_temp_file(temp_file_path, getenv("MYSQLTEST_VARDIR"),
2900
 
                            "tmp", O_CREAT | O_SHARE | O_RDWR,
 
2900
                            "tmp", O_CREAT | O_RDWR,
2901
2901
                            MYF(MY_WME))) < 0)
2902
2902
    die("Failed to create temporary file for perl command");
2903
2903
  my_close(fd, MYF(0));
4533
4533
    embedded_server_arg_count=1;
4534
4534
    embedded_server_args[0]= (char*) "";    /* Progname */
4535
4535
  }
4536
 
  if (!(file=my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME))))
 
4536
  if (!(file=my_fopen(buff, O_RDONLY, MYF(MY_WME))))
4537
4537
    die("Failed to open file '%s'", buff);
4538
4538
 
4539
4539
  while (embedded_server_arg_count < MAX_EMBEDDED_SERVER_ARGS &&
4576
4576
    fn_format(buff, argument, "", "", MY_UNPACK_FILENAME);
4577
4577
    assert(cur_file == file_stack && cur_file->file == 0);
4578
4578
    if (!(cur_file->file=
4579
 
          my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))
 
4579
          my_fopen(buff, O_RDONLY, MYF(0))))
4580
4580
      die("Could not open '%s' for reading: errno = %d", buff, errno);
4581
4581
    cur_file->file_name= my_strdup(buff, MYF(MY_FAE));
4582
4582
    cur_file->lineno= 1;