← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2008-08-11 05:35:22 UTC
  • Revision ID: brian@tangent.org-20080811053522-ja8if8vjk87wen23
Minor cleanups around ulong in kernel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
74
74
static int read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
75
75
                             List<Item> &fields_vars, List<Item> &set_fields,
76
76
                             List<Item> &set_values, READ_INFO &read_info,
77
 
                             ulong skip_lines,
 
77
                             uint32_t skip_lines,
78
78
                             bool ignore_check_option_errors);
79
79
static int read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
80
80
                          List<Item> &fields_vars, List<Item> &set_fields,
81
81
                          List<Item> &set_values, READ_INFO &read_info,
82
 
                          String &enclosed, ulong skip_lines,
 
82
                          String &enclosed, uint32_t skip_lines,
83
83
                          bool ignore_check_option_errors);
84
84
 
85
85
static bool write_execute_load_query_log_event(THD *thd,
129
129
    loaded is located
130
130
  */
131
131
  char *tdb= thd->db ? thd->db : db;            // Result is never null
132
 
  ulong skip_lines= ex->skip_lines;
 
132
  uint32_t skip_lines= ex->skip_lines;
133
133
  bool transactional_table;
134
134
  THD::killed_state killed_status= THD::NOT_KILLED;
135
135
 
432
432
    error= -1;                          // Error on read
433
433
    goto err;
434
434
  }
435
 
  sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
436
 
          (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
 
435
  sprintf(name, ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
 
436
          (uint32_t) (info.records - info.copied), (uint32_t) thd->cuted_fields);
437
437
 
438
438
  if (thd->transaction.stmt.modified_non_trans_table)
439
439
    thd->transaction.all.modified_non_trans_table= true;
504
504
read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
505
505
                  List<Item> &fields_vars, List<Item> &set_fields,
506
506
                  List<Item> &set_values, READ_INFO &read_info,
507
 
                  ulong skip_lines, bool ignore_check_option_errors)
 
507
                  uint32_t skip_lines, bool ignore_check_option_errors)
508
508
{
509
509
  List_iterator_fast<Item> it(fields_vars);
510
510
  Item_field *sql_field;
620
620
read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
621
621
               List<Item> &fields_vars, List<Item> &set_fields,
622
622
               List<Item> &set_values, READ_INFO &read_info,
623
 
               String &enclosed, ulong skip_lines,
 
623
               String &enclosed, uint32_t skip_lines,
624
624
               bool ignore_check_option_errors)
625
625
{
626
626
  List_iterator_fast<Item> it(fields_vars);