← 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: 2010-08-17 01:34:55 UTC
  • mto: (1711.1.23 build)
  • mto: This revision was merged to the branch mainline in revision 1714.
  • Revision ID: brian@tangent.org-20100817013455-zx3nm7qilxvpwrgb
Style on structure cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
85
85
  void set_io_cache_arg(void* arg) { cache.arg = arg; }
86
86
};
87
87
 
88
 
static int read_fixed_length(Session *session, COPY_INFO &info, TableList *table_list,
 
88
static int read_fixed_length(Session *session, CopyInfo &info, TableList *table_list,
89
89
                             List<Item> &fields_vars, List<Item> &set_fields,
90
90
                             List<Item> &set_values, READ_INFO &read_info,
91
91
                             uint32_t skip_lines,
92
92
                             bool ignore_check_option_errors);
93
 
static int read_sep_field(Session *session, COPY_INFO &info, TableList *table_list,
 
93
static int read_sep_field(Session *session, CopyInfo &info, TableList *table_list,
94
94
                          List<Item> &fields_vars, List<Item> &set_fields,
95
95
                          List<Item> &set_values, READ_INFO &read_info,
96
96
                          String &enclosed, uint32_t skip_lines,
302
302
    }
303
303
  }
304
304
 
305
 
  COPY_INFO info;
 
305
  CopyInfo info;
306
306
  memset(&info, 0, sizeof(info));
307
307
  info.ignore= ignore;
308
308
  info.handle_duplicates=handle_duplicates;
411
411
****************************************************************************/
412
412
 
413
413
static int
414
 
read_fixed_length(Session *session, COPY_INFO &info, TableList *table_list,
 
414
read_fixed_length(Session *session, CopyInfo &info, TableList *table_list,
415
415
                  List<Item> &fields_vars, List<Item> &set_fields,
416
416
                  List<Item> &set_values, READ_INFO &read_info,
417
417
                  uint32_t skip_lines, bool ignore_check_option_errors)
530
530
 
531
531
 
532
532
static int
533
 
read_sep_field(Session *session, COPY_INFO &info, TableList *table_list,
 
533
read_sep_field(Session *session, CopyInfo &info, TableList *table_list,
534
534
               List<Item> &fields_vars, List<Item> &set_fields,
535
535
               List<Item> &set_values, READ_INFO &read_info,
536
536
               String &enclosed, uint32_t skip_lines,