← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Monty Taylor
  • Date: 2008-12-17 18:23:08 UTC
  • mfrom: (685.3.3 mysys-slimdown)
  • mto: This revision was merged to the branch mainline in revision 713.
  • Revision ID: monty@inaugust.com-20081217182308-bcuztplharskm9yh
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
2493
2493
 
2494
2494
static void do_mkdir(struct st_command *command)
2495
2495
{
 
2496
  string ds_dirname;
2496
2497
  int error;
2497
 
  string ds_dirname;
2498
2498
  const struct command_arg mkdir_args[] = {
2499
2499
    {"dirname", ARG_STRING, true, &ds_dirname, "Directory to create"}
2500
2500
  };
2504
2504
                     mkdir_args, sizeof(mkdir_args)/sizeof(struct command_arg),
2505
2505
                     ' ');
2506
2506
 
2507
 
  error= my_mkdir(ds_dirname.c_str(), 0777, MYF(0)) != 0;
 
2507
  error= mkdir(ds_dirname.c_str(), (0777 & my_umask_dir)) != 0;
2508
2508
  handle_command_error(command, error);
2509
2509
  return;
2510
2510
}
3015
3015
    drizzle_free_result(res);
3016
3016
    if (done)
3017
3017
      break;
3018
 
    my_sleep(SLAVE_POLL_INTERVAL);
 
3018
    usleep(SLAVE_POLL_INTERVAL);
3019
3019
  }
3020
3020
  return;
3021
3021
}
3218
3218
    sleep_val= opt_sleep;
3219
3219
 
3220
3220
  if (sleep_val)
3221
 
    my_sleep((uint32_t) (sleep_val * 1000000L));
 
3221
    usleep((uint32_t) (sleep_val * 1000000L));
3222
3222
  command->last_argument= sleep_end;
3223
3223
  return 0;
3224
3224
}
3609
3609
      verbose_msg("Connect attempt %d/%d failed: %d: %s", failed_attempts,
3610
3610
                  opt_max_connect_retries, drizzle_errno(drizzle),
3611
3611
                  drizzle_error(drizzle));
3612
 
      my_sleep(connection_retry_sleep);
 
3612
      usleep(connection_retry_sleep);
3613
3613
    }
3614
3614
    else
3615
3615
    {