← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.cc

  • Committer: Brian Aker
  • Date: 2009-02-20 22:48:37 UTC
  • Revision ID: brian@tangent.org-20090220224837-fw5wrf46n4ru3e6a
First pass of stripping uint

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.cc
37
37
using namespace std;
38
38
 
39
39
/* Global Thread counter */
40
 
uint counter;
 
40
uint32_t counter;
41
41
pthread_mutex_t counter_mutex;
42
42
pthread_cond_t count_threshhold;
43
43
 
44
44
static void db_error_with_table(DRIZZLE *drizzle, char *table);
45
45
static void db_error(DRIZZLE *drizzle);
46
 
static char *field_escape(char *to,const char *from,uint length);
 
46
static char *field_escape(char *to,const char *from,uint32_t length);
47
47
static char *add_load_option(char *ptr,const char *object,
48
48
           const char *statement);
49
49
 
52
52
            ignore= false, opt_compress= false, opt_low_priority= false,
53
53
            tty_password= false;
54
54
static bool debug_info_flag= false, debug_check_flag= false;
55
 
static uint opt_use_threads= 0, opt_local_file= 0, my_end_arg= 0;
 
55
static uint32_t opt_use_threads= 0, opt_local_file= 0, my_end_arg= 0;
56
56
static char  *opt_password= NULL, *current_user= NULL,
57
57
    *current_host= NULL, *current_db= NULL, *fields_terminated= NULL,
58
58
    *lines_terminated= NULL, *enclosed= NULL, *opt_enclosed= NULL,
59
59
    *escaped= NULL, *opt_columns= NULL,
60
60
    *default_charset= (char*) DRIZZLE_DEFAULT_CHARSET_NAME;
61
 
static uint opt_protocol= 0;
 
61
static uint32_t opt_protocol= 0;
62
62
static uint32_t opt_drizzle_port= 0;
63
63
static char * opt_drizzle_unix_port= 0;
64
64
static int64_t opt_ignore_lines= -1;
492
492
** syntax errors from the SQL parser.
493
493
*/
494
494
 
495
 
static char *field_escape(char *to,const char *from,uint length)
 
495
static char *field_escape(char *to,const char *from,uint32_t length)
496
496
{
497
497
  const char *end;
498
 
  uint end_backslashes=0;
 
498
  uint32_t end_backslashes=0;
499
499
 
500
500
  for (end= from+length; from != end; from++)
501
501
  {