← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

Viewing changes to sql/log_event.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-07-22 15:07:29 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20130722150729-aowg83m93ncg1ils
Tags: 5.1.70-0ubuntu0.10.04.1
https://launchpad.net/bugs/1203828
* SECURITY UPDATE: Update to 5.1.70 to fix security issues (LP: #1203828)
  - http://www.oracle.com/technetwork/topics/security/cpujuly2013-1899826.html
  - CVE-2013-1861
  - CVE-2013-3802
  - CVE-2013-3804
* SECURITY UPDATE: insecure creation of debian.cnf file
  - debian/mysql-server-5.1.postinst: set umask to 066 before creating
    debian.cnf.
  - CVE-2013-2162

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/log_event.cc
5721
5721
                   const Format_description_log_event* description_event)
5722
5722
  :Log_event(buf, description_event)
5723
5723
#ifndef MYSQL_CLIENT
5724
 
  , deferred(false)
 
5724
  , deferred(false), query_id(0)
5725
5725
#endif
5726
5726
{
5727
5727
  bool error= false;
5967
5967
{
5968
5968
  Item *it= 0;
5969
5969
  CHARSET_INFO *charset;
 
5970
  query_id_t sav_query_id= 0; /* memorize orig id when deferred applying */
5970
5971
 
5971
5972
  if (rli->deferred_events_collecting)
5972
5973
  {
5973
 
    set_deferred();
 
5974
    set_deferred(current_thd->query_id);
5974
5975
    return rli->deferred_events->add(this);
 
5976
  } else if (is_deferred())
 
5977
  {
 
5978
    sav_query_id= current_thd->query_id;
 
5979
    current_thd->query_id= query_id; /* recreating original time context */
5975
5980
  }
5976
5981
 
5977
5982
  if (!(charset= get_charset(charset_number, MYF(MY_WME))))
6045
6050
  e->update_hash(val, val_len, type, charset, DERIVATION_IMPLICIT, 0);
6046
6051
  if (!is_deferred())
6047
6052
    free_root(thd->mem_root,0);
 
6053
  else
 
6054
    current_thd->query_id= sav_query_id; /* restore current query's context */
6048
6055
 
6049
6056
  return 0;
6050
6057
}
9189
9196
#ifdef MYSQL_CLIENT
9190
9197
void Write_rows_log_event::print(FILE *file, PRINT_EVENT_INFO* print_event_info)
9191
9198
{
 
9199
  DBUG_EXECUTE_IF("simulate_cache_read_error",
 
9200
                  {DBUG_SET("+d,simulate_my_b_fill_error");});
9192
9201
  Rows_log_event::print_helper(file, print_event_info, "Write_rows");
9193
9202
}
9194
9203
#endif