← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.c

Merged in codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.c
109
109
typedef struct st_status
110
110
{
111
111
  int exit_status;
112
 
  ulong query_start_line;
 
112
  uint32_t query_start_line;
113
113
  char *file_name;
114
114
  LINE_BUFFER *line_buff;
115
115
  bool batch,add_to_history;
153
153
static char *full_username=0,*part_username=0;
154
154
static int wait_time = 5;
155
155
static STATUS status;
156
 
static ulong select_limit,max_join_size,opt_connect_timeout=0;
 
156
static uint32_t select_limit;
 
157
static uint32_t max_join_size;
 
158
static ulong opt_connect_timeout= 0;
157
159
static char mysql_charsets_dir[FN_REFLEN+1];
158
160
static const char *xmlmeta[] = {
159
161
  "&", "&",
3926
3928
  {
3927
3929
    char init_command[100];
3928
3930
    sprintf(init_command,
3929
 
            "SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%lu,SQL_MAX_JOIN_SIZE=%lu",
3930
 
            select_limit,max_join_size);
 
3931
            "SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%"PRIu32
 
3932
            ",SQL_MAX_JOIN_SIZE=%"PRIu32,
 
3933
            select_limit, max_join_size);
3931
3934
    mysql_options(&mysql, MYSQL_INIT_COMMAND, init_command);
3932
3935
  }
3933
3936
  if (default_charset_used)
4157
4160
      }
4158
4161
      if (status.query_start_line && line_numbers)
4159
4162
      {
4160
 
        (void) fprintf(file," at line %lu",status.query_start_line);
 
4163
        (void) fprintf(file," at line %"PRIu32,status.query_start_line);
4161
4164
        if (status.file_name)
4162
4165
          (void) fprintf(file," in file: '%s'", status.file_name);
4163
4166
      }