← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to sql/log_event.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-07-21 07:09:29 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20150721070929-mg4dpqkgg3it1ajf
Tags: upstream-5.6.25
Import upstream version 5.6.25

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/log_event.cc
2503
2503
  uint32 size= uint4korr(ptr + EVENT_LEN_OFFSET);
2504
2504
  DBUG_ENTER("Log_event::print_base64");
2505
2505
 
2506
 
  size_t const tmp_str_sz= base64_needed_encoded_length((int) size);
 
2506
  uint64 const tmp_str_sz= base64_needed_encoded_length((uint64) size);
2507
2507
  char *const tmp_str= (char *) my_malloc(tmp_str_sz, MYF(MY_WME));
2508
2508
  if (!tmp_str) {
2509
2509
    fprintf(stderr, "\nError: Out of memory. "
3411
3411
      user= thd->get_invoker_user();
3412
3412
      host= thd->get_invoker_host();
3413
3413
    }
3414
 
    else if (thd->security_ctx->priv_user)
 
3414
    else
3415
3415
    {
3416
3416
      Security_context *ctx= thd->security_ctx;
3417
3417
 
10732
10732
  {
10733
10733
    /* we need to unpack the AI so that positions get updated */
10734
10734
    m_curr_row= m_curr_row_end;
10735
 
    unpack_current_row(rli, &m_cols);
 
10735
    unpack_current_row(rli, &m_cols_ai);
10736
10736
  }
10737
10737
  m_table->default_column_bitmaps();
10738
10738
  DBUG_RETURN(error);
13781
13781
   auto_increment_increment(0),auto_increment_offset(0), charset_inited(0),
13782
13782
   lc_time_names_number(~0),
13783
13783
   charset_database_number(ILLEGAL_CHARSET_INFO_NUMBER),
13784
 
   thread_id(0), thread_id_printed(false),
 
13784
   thread_id(0), thread_id_printed(false),server_id_from_fd_event(0),
13785
13785
   base64_output_mode(BASE64_OUTPUT_UNSPEC), printed_fd_event(FALSE),
13786
13786
   have_unflushed_events(false), skipped_event_in_transaction(false),
13787
13787
   is_gtid_next_set(false), is_gtid_next_valid(true)