← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
149
149
  assert(tdb);
150
150
  uint32_t skip_lines= ex->skip_lines;
151
151
  bool transactional_table;
152
 
  Session::killed_state_t killed_status= Session::NOT_KILLED;
153
152
 
154
153
  /* Escape and enclosed character may be a utf8 4-byte character */
155
154
  if (escaped->length() > 4 || enclosed->length() > 4)
399
398
     simulated killing in the middle of per-row loop
400
399
     must be effective for binlogging
401
400
  */
402
 
  killed_status= (error == 0)? Session::NOT_KILLED : session->getKilled();
403
 
  if (error)
 
401
  if (error) 
404
402
  {
405
403
    error= -1;                          // Error on read
406
404
    goto err;
439
437
  List<Item>::iterator it(fields_vars.begin());
440
438
  Item_field *sql_field;
441
439
  Table *table= table_list->table;
442
 
  uint64_t id;
443
440
  bool err;
444
441
 
445
 
  id= 0;
446
 
 
447
442
  while (!read_info.read_fixed_length())
448
443
  {
449
444
    if (session->getKilled())
561
556
  Item *item;
562
557
  Table *table= table_list->table;
563
558
  uint32_t enclosed_length;
564
 
  uint64_t id;
565
559
  bool err;
566
560
 
567
561
  enclosed_length=enclosed.length();
568
 
  id= 0;
569
562
 
570
563
  for (;;it= fields_vars.begin())
571
564
  {