← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.cc

Merged from Yoshinori Sano.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_class.cc
2473
2473
      flush the pending event and replace it with the newly created
2474
2474
      event...
2475
2475
    */
2476
 
    if (unlikely(mysql_bin_log.flush_and_set_pending_rows_event(this, ev)))
 
2476
    if (unlikely(drizzle_bin_log.flush_and_set_pending_rows_event(this, ev)))
2477
2477
    {
2478
2478
      delete ev;
2479
2479
      return(NULL);
2619
2619
int Session::binlog_write_row(Table* table, bool is_trans, 
2620
2620
                          unsigned char const *record) 
2621
2621
{ 
2622
 
  assert(mysql_bin_log.is_open());
 
2622
  assert(drizzle_bin_log.is_open());
2623
2623
 
2624
2624
  /*
2625
2625
    Pack records into format for transfer. We are allocating more
2647
2647
                           const unsigned char *before_record,
2648
2648
                           const unsigned char *after_record)
2649
2649
{ 
2650
 
  assert(mysql_bin_log.is_open());
 
2650
  assert(drizzle_bin_log.is_open());
2651
2651
 
2652
2652
  size_t const before_maxlen = table->max_row_length(before_record);
2653
2653
  size_t const after_maxlen  = table->max_row_length(after_record);
2680
2680
int Session::binlog_delete_row(Table* table, bool is_trans, 
2681
2681
                           unsigned char const *record)
2682
2682
{ 
2683
 
  assert(mysql_bin_log.is_open());
 
2683
  assert(drizzle_bin_log.is_open());
2684
2684
 
2685
2685
  /* 
2686
2686
     Pack records into format for transfer. We are allocating more
2712
2712
    mode: it might be the case that we left row-based mode before
2713
2713
    flushing anything (e.g., if we have explicitly locked tables).
2714
2714
   */
2715
 
  if (!mysql_bin_log.is_open())
 
2715
  if (!drizzle_bin_log.is_open())
2716
2716
    return(0);
2717
2717
 
2718
2718
  /*
2729
2729
      binlog_table_maps= 0;
2730
2730
    }
2731
2731
 
2732
 
    error= mysql_bin_log.flush_and_set_pending_rows_event(this, 0);
 
2732
    error= drizzle_bin_log.flush_and_set_pending_rows_event(this, 0);
2733
2733
  }
2734
2734
 
2735
2735
  return(error);
2763
2763
                      ulong query_len, bool is_trans, bool suppress_use,
2764
2764
                      Session::killed_state killed_status_arg)
2765
2765
{
2766
 
  assert(query_arg && mysql_bin_log.is_open());
 
2766
  assert(query_arg && drizzle_bin_log.is_open());
2767
2767
 
2768
2768
  if (int error= binlog_flush_pending_rows_event(true))
2769
2769
    return(error);
2816
2816
        log event is written to the binary log, we pretend that no
2817
2817
        table maps were written.
2818
2818
       */
2819
 
      int error= mysql_bin_log.write(&qinfo);
 
2819
      int error= drizzle_bin_log.write(&qinfo);
2820
2820
      binlog_table_maps= 0;
2821
2821
      return(error);
2822
2822
    }