← 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-11-08 20:10:51 UTC
  • mfrom: (1910.2.8 merge)
  • Revision ID: brian@tangent.org-20101108201051-fmplr6oke3c088kf
Encapsulation around locking/kill

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
142
142
  assert(tdb);
143
143
  uint32_t skip_lines= ex->skip_lines;
144
144
  bool transactional_table;
145
 
  Session::killed_state killed_status= Session::NOT_KILLED;
 
145
  Session::killed_state_t killed_status= Session::NOT_KILLED;
146
146
 
147
147
  /* Escape and enclosed character may be a utf8 4-byte character */
148
148
  if (escaped->length() > 4 || enclosed->length() > 4)
390
390
     simulated killing in the middle of per-row loop
391
391
     must be effective for binlogging
392
392
  */
393
 
  killed_status= (error == 0)? Session::NOT_KILLED : session->killed;
 
393
  killed_status= (error == 0)? Session::NOT_KILLED : session->getKilled();
394
394
  if (error)
395
395
  {
396
396
    error= -1;                          // Error on read
436
436
 
437
437
  while (!read_info.read_fixed_length())
438
438
  {
439
 
    if (session->killed)
 
439
    if (session->getKilled())
440
440
    {
441
441
      session->send_kill_message();
442
442
      return(1);
509
509
                          ER(ER_WARN_TOO_MANY_RECORDS), session->row_count);
510
510
    }
511
511
 
512
 
    if (session->killed ||
 
512
    if (session->getKilled() ||
513
513
        fill_record(session, set_fields, set_values,
514
514
                    ignore_check_option_errors))
515
515
      return(1);
558
558
 
559
559
  for (;;it.rewind())
560
560
  {
561
 
    if (session->killed)
 
561
    if (session->getKilled())
562
562
    {
563
563
      session->send_kill_message();
564
564
      return(1);
691
691
      }
692
692
    }
693
693
 
694
 
    if (session->killed ||
 
694
    if (session->getKilled() ||
695
695
        fill_record(session, set_fields, set_values,
696
696
                    ignore_check_option_errors))
697
697
      return(1);
712
712
      push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
713
713
                          ER_WARN_TOO_MANY_RECORDS, ER(ER_WARN_TOO_MANY_RECORDS),
714
714
                          session->row_count);
715
 
      if (session->killed)
 
715
      if (session->getKilled())
716
716
        return(1);
717
717
    }
718
718
    session->row_count++;