← Back to branch summary

~thomir-deactivatedaccount/drizzle/drizzle-fix-bug653747

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

Merged from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
146
146
  See the timer_output() definition for details
147
147
*/
148
148
static char *timer_file = NULL;
149
 
static ulonglong timer_start;
 
149
static uint64_t timer_start;
150
150
static void timer_output(void);
151
 
static ulonglong timer_now(void);
 
151
static uint64_t timer_now(void);
152
152
 
153
 
static ulonglong progress_start= 0;
 
153
static uint64_t progress_start= 0;
154
154
 
155
155
DYNAMIC_ARRAY q_lines;
156
156
 
1583
1583
 
1584
1584
 
1585
1585
static uchar *get_var_key(const uchar* var, size_t *len,
1586
 
                          my_bool __attribute__((unused)) t)
 
1586
                          bool __attribute__((unused)) t)
1587
1587
{
1588
1588
  register char* key;
1589
1589
  key = ((VAR*)var)->name;
3198
3198
 
3199
3199
    if (have_ndbcluster)
3200
3200
    {
3201
 
      ulonglong start_epoch= 0, handled_epoch= 0,
 
3201
      uint64_t start_epoch= 0, handled_epoch= 0,
3202
3202
        latest_epoch=0, latest_trans_epoch=0,
3203
3203
        latest_handled_binlog_epoch= 0, latest_received_binlog_epoch= 0,
3204
3204
        latest_applied_binlog_epoch= 0;
5053
5053
*/
5054
5054
 
5055
5055
static void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field,
5056
 
                         const char* val, ulonglong len, bool is_null)
 
5056
                         const char* val, uint64_t len, bool is_null)
5057
5057
{
5058
5058
  if (col_idx < max_replace_column && replace_column[col_idx])
5059
5059
  {
5163
5163
  Append affected row count and other info to output
5164
5164
*/
5165
5165
 
5166
 
static void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows,
 
5166
static void append_info(DYNAMIC_STRING *ds, uint64_t affected_rows,
5167
5167
                        const char *info)
5168
5168
{
5169
5169
  char buf[40], buff2[21];
5304
5304
 
5305
5305
    if (!disable_result_log)
5306
5306
    {
5307
 
      ulonglong affected_rows= 0;    /* Ok to be undef if 'disable_info' is set */
 
5307
      uint64_t affected_rows= 0;    /* Ok to be undef if 'disable_info' is set */
5308
5308
 
5309
5309
      if (res)
5310
5310
      {
5718
5718
                          int line)
5719
5719
{
5720
5720
  char buf[32], *end;
5721
 
  ulonglong timer= timer_now();
 
5721
  uint64_t timer= timer_now();
5722
5722
  if (!progress_start)
5723
5723
    progress_start= timer;
5724
5724
  timer-= progress_start;
5725
5725
 
5726
5726
  /* Milliseconds since start */
5727
 
  end= longlong2str(timer, buf, 10);
 
5727
  end= int64_t2str(timer, buf, 10);
5728
5728
  dynstr_append_mem(&ds_progress, buf, (int)(end-buf));
5729
5729
  dynstr_append_mem(&ds_progress, "\t", 1);
5730
5730
 
6232
6232
  if (timer_file)
6233
6233
  {
6234
6234
    char buf[32], *end;
6235
 
    ulonglong timer= timer_now() - timer_start;
6236
 
    end= longlong2str(timer, buf, 10);
 
6235
    uint64_t timer= timer_now() - timer_start;
 
6236
    end= int64_t2str(timer, buf, 10);
6237
6237
    str_to_file(timer_file,buf, (int) (end-buf));
6238
6238
    /* Timer has been written to the file, don't use it anymore */
6239
6239
    timer_file= 0;
6241
6241
}
6242
6242
 
6243
6243
 
6244
 
ulonglong timer_now(void)
 
6244
uint64_t timer_now(void)
6245
6245
{
6246
6246
  return my_micro_time() / 1000;
6247
6247
}
7419
7419
void replace_dynstr_append_uint(DYNAMIC_STRING *ds, uint val)
7420
7420
{
7421
7421
  char buff[22]; /* This should be enough for any int */
7422
 
  char *end= longlong10_to_str(val, buff, 10);
 
7422
  char *end= int64_t10_to_str(val, buff, 10);
7423
7423
  replace_dynstr_append_mem(ds, buff, end - buff);
7424
7424
}
7425
7425