~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Brian Aker
  • Date: 2008-08-10 17:36:50 UTC
  • Revision ID: brian@tangent.org-20080810173650-zuho0mi0zg9s66hi
Final ulong cleanup in clients

Show diffs side-by-side

added added

removed removed

Lines of Context:
147
147
typedef struct
148
148
{
149
149
  char file[FN_REFLEN];
150
 
  ulong pos;
 
150
  uint32_t pos;
151
151
} master_pos_st;
152
152
 
153
153
master_pos_st master_pos;
2157
2157
*/
2158
2158
 
2159
2159
static int replace(DYNAMIC_STRING *ds_str,
2160
 
                   const char *search_str, ulong search_len,
2161
 
                   const char *replace_str, ulong replace_len)
 
2160
                   const char *search_str, uint32_t search_len,
 
2161
                   const char *replace_str, uint32_t replace_len)
2162
2162
{
2163
2163
  DYNAMIC_STRING ds_tmp;
2164
2164
  const char *start= strstr(ds_str->str, search_str);
3284
3284
    sleep_val= opt_sleep;
3285
3285
 
3286
3286
  if (sleep_val)
3287
 
    my_sleep((ulong) (sleep_val * 1000000L));
 
3287
    my_sleep((uint32_t) (sleep_val * 1000000L));
3288
3288
  command->last_argument= sleep_end;
3289
3289
  return 0;
3290
3290
}
3655
3655
                  int port)
3656
3656
{
3657
3657
  int failed_attempts= 0;
3658
 
  static ulong connection_retry_sleep= 100000; /* Microseconds */
 
3658
  static uint32_t connection_retry_sleep= 100000; /* Microseconds */
3659
3659
 
3660
3660
 
3661
3661
  while(!drizzle_connect(drizzle, host, user, pass, db, port, NULL,