← Back to branch summary

~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-proposed

« back to all changes in this revision

Viewing changes to sql/sql_binlog.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
https://launchpad.net/bugs/937869
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_binlog.cc
1
 
/* Copyright (C) 2005-2006 MySQL AB
 
1
/*
 
2
   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
2
3
 
3
4
   This program is free software; you can redistribute it and/or modify
4
5
   it under the terms of the GNU General Public License as published by
11
12
 
12
13
   You should have received a copy of the GNU General Public License
13
14
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
15
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
16
*/
15
17
 
16
18
#include "mysql_priv.h"
17
19
#include "rpl_rli.h"
51
53
  size_t decoded_len= base64_needed_decoded_length(coded_len);
52
54
 
53
55
  /*
 
56
    thd->options will be changed when applying the event. But we don't expect
 
57
    it be changed permanently after BINLOG statement, so backup it first.
 
58
    It will be restored at the end of this function.
 
59
  */
 
60
  ulonglong thd_options= thd->options;
 
61
 
 
62
  /*
54
63
    Allocation
55
64
  */
56
65
 
225
234
          TODO: Maybe a better error message since the BINLOG statement
226
235
          now contains several events.
227
236
        */
228
 
        my_error(ER_UNKNOWN_ERROR, MYF(0), "Error executing BINLOG statement");
 
237
        my_error(ER_UNKNOWN_ERROR, MYF(0));
229
238
        goto end;
230
239
      }
231
240
    }
236
245
  my_ok(thd);
237
246
 
238
247
end:
 
248
  thd->options= thd_options;
239
249
  rli->clear_tables_to_lock();
240
250
  my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
241
251
  DBUG_VOID_RETURN;