← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.c

  • Committer: Monty Taylor
  • Date: 2008-07-15 19:05:24 UTC
  • mfrom: (77.1.109 codestyle)
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: monty@inaugust.com-20080715190524-nc4uahsj82181zpp
Merged fro mcodestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.c
115
115
typedef struct st_status
116
116
{
117
117
  int exit_status;
118
 
  ulong query_start_line;
 
118
  uint32_t query_start_line;
119
119
  char *file_name;
120
120
  LINE_BUFFER *line_buff;
121
121
  bool batch,add_to_history;
160
160
static int wait_time = 5;
161
161
static STATUS status;
162
162
static uint32_t select_limit;
163
 
static ulong max_join_size;
 
163
static uint32_t max_join_size;
164
164
static ulong opt_connect_timeout= 0;
165
165
static char mysql_charsets_dir[FN_REFLEN+1];
166
166
static const char *xmlmeta[] = {
3934
3934
  {
3935
3935
    char init_command[100];
3936
3936
    sprintf(init_command,
3937
 
            "SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%u,SQL_MAX_JOIN_SIZE=%u",
3938
 
            select_limit,max_join_size);
 
3937
                  "SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%"PRIu32
 
3938
            ",SQL_MAX_JOIN_SIZE=%"PRIu32,
 
3939
                  select_limit, max_join_size);
3939
3940
    mysql_options(&mysql, MYSQL_INIT_COMMAND, init_command);
3940
3941
  }
3941
3942
  if (default_charset_used)
4165
4166
      }
4166
4167
      if (status.query_start_line && line_numbers)
4167
4168
      {
4168
 
        (void) fprintf(file," at line %u",status.query_start_line);
 
4169
        (void) fprintf(file," at line %"PRIu32,status.query_start_line);
4169
4170
        if (status.file_name)
4170
4171
          (void) fprintf(file," in file: '%s'", status.file_name);
4171
4172
      }