~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-17 05:39:06 UTC
  • mto: (685.1.40 devel) (713.1.5 devel)
  • mto: This revision was merged to the branch mainline in revision 713.
  • Revision ID: dev@torum.net-20081217053906-osiyrl3gnoncb88c
Removed my_mkdir() and my_sleep()

Show diffs side-by-side

added added

removed removed

Lines of Context:
2468
2468
 
2469
2469
static void do_mkdir(struct st_command *command)
2470
2470
{
 
2471
  string ds_dirname;
2471
2472
  int error;
2472
 
  string ds_dirname;
2473
2473
  const struct command_arg mkdir_args[] = {
2474
2474
    {"dirname", ARG_STRING, true, &ds_dirname, "Directory to create"}
2475
2475
  };
2479
2479
                     mkdir_args, sizeof(mkdir_args)/sizeof(struct command_arg),
2480
2480
                     ' ');
2481
2481
 
2482
 
  error= my_mkdir(ds_dirname.c_str(), 0777, MYF(0)) != 0;
 
2482
  error= mkdir(ds_dirname.c_str(), (0777 & my_umask_dir)) != 0;
2483
2483
  handle_command_error(command, error);
2484
2484
  return;
2485
2485
}
2990
2990
    drizzle_free_result(res);
2991
2991
    if (done)
2992
2992
      break;
2993
 
    my_sleep(SLAVE_POLL_INTERVAL);
 
2993
    usleep(SLAVE_POLL_INTERVAL);
2994
2994
  }
2995
2995
  return;
2996
2996
}
3193
3193
    sleep_val= opt_sleep;
3194
3194
 
3195
3195
  if (sleep_val)
3196
 
    my_sleep((uint32_t) (sleep_val * 1000000L));
 
3196
    usleep((uint32_t) (sleep_val * 1000000L));
3197
3197
  command->last_argument= sleep_end;
3198
3198
  return 0;
3199
3199
}
3584
3584
      verbose_msg("Connect attempt %d/%d failed: %d: %s", failed_attempts,
3585
3585
                  opt_max_connect_retries, drizzle_errno(drizzle),
3586
3586
                  drizzle_error(drizzle));
3587
 
      my_sleep(connection_retry_sleep);
 
3587
      usleep(connection_retry_sleep);
3588
3588
    }
3589
3589
    else
3590
3590
    {