← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to sql/sp_head.cc

  • Committer: Package Import Robot
  • Author(s): James Page, Otto Kekäläinen
  • Date: 2014-02-17 16:51:52 UTC
  • mfrom: (2.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140217165152-k315d3175g865kkx
Tags: 5.5.35-1
http://bugs.debian.org/737597
http://bugs.debian.org/733002
http://bugs.debian.org/734426
http://bugs.debian.org/735284
http://bugs.debian.org/736480
http://bugs.debian.org/732967
[ Otto Kekäläinen ]
* New upstream release, fixing the following security issues:
  - Buffer overflow in client/mysql.cc (Closes: #737597).
    - CVE-2014-0001
  - http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html
    - CVE-2013-5891
    - CVE-2013-5908
    - CVE-2014-0386
    - CVE-2014-0393
    - CVE-2014-0401
    - CVE-2014-0402
    - CVE-2014-0412
    - CVE-2014-0420
    - CVE-2014-0437
* Upstream https://mariadb.atlassian.net/browse/MDEV-4902
  fixes compatibility with Bison 3.0 (Closes: #733002)
* Updated Russian debconf translation (Closes: #734426)
* Updated Japanese debconf translation (Closes: #735284)
* Updated French debconf translation (Closes: #736480)
* Renamed SONAME properly (Closes: #732967)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sp_head.cc
1
1
/*
2
 
   Copyright (c) 2002, 2011, Oracle and/or its affiliates.
 
2
   Copyright (c) 2002, 2013, Oracle and/or its affiliates.
 
3
   Copyright (c) 2011, 2013, Monty Program Ab
3
4
 
4
5
   This program is free software; you can redistribute it and/or modify
5
6
   it under the terms of the GNU General Public License as published by
2150
2151
    close_thread_tables(thd);
2151
2152
    thd_proc_info(thd, 0);
2152
2153
 
2153
 
    if (! thd->in_sub_stmt && ! thd->in_multi_stmt_transaction_mode())
2154
 
      thd->mdl_context.release_transactional_locks();
2155
 
    else if (! thd->in_sub_stmt)
2156
 
      thd->mdl_context.release_statement_locks();
 
2154
    if (! thd->in_sub_stmt)
 
2155
    {
 
2156
      if (thd->transaction_rollback_request)
 
2157
      {
 
2158
        trans_rollback_implicit(thd);
 
2159
        thd->mdl_context.release_transactional_locks();
 
2160
      }
 
2161
      else if (! thd->in_multi_stmt_transaction_mode())
 
2162
        thd->mdl_context.release_transactional_locks();
 
2163
      else
 
2164
        thd->mdl_context.release_statement_locks();
 
2165
    }
2157
2166
 
2158
2167
    thd->rollback_item_tree_changes();
2159
2168
 
3005
3014
    close_thread_tables(thd);
3006
3015
    thd_proc_info(thd, 0);
3007
3016
 
3008
 
    if (! thd->in_sub_stmt && ! thd->in_multi_stmt_transaction_mode())
3009
 
      thd->mdl_context.release_transactional_locks();
3010
 
    else if (! thd->in_sub_stmt)
3011
 
      thd->mdl_context.release_statement_locks();
 
3017
    if (! thd->in_sub_stmt)
 
3018
    {
 
3019
      if (thd->transaction_rollback_request)
 
3020
      {
 
3021
        trans_rollback_implicit(thd);
 
3022
        thd->mdl_context.release_transactional_locks();
 
3023
      }
 
3024
      else if (! thd->in_multi_stmt_transaction_mode())
 
3025
        thd->mdl_context.release_transactional_locks();
 
3026
      else
 
3027
        thd->mdl_context.release_statement_locks();
 
3028
    }
3012
3029
  }
3013
3030
 
3014
3031
  if (m_lex->query_tables_own_last)
3137
3154
        log_slow_statement(thd);
3138
3155
    }
3139
3156
    else
 
3157
    {
 
3158
      /* change statistics */
 
3159
      enum_sql_command save_sql_command= thd->lex->sql_command;
 
3160
      thd->lex->sql_command= SQLCOM_SELECT;
 
3161
      status_var_increment(thd->status_var.com_stat[SQLCOM_SELECT]);
 
3162
      thd->update_stats();
 
3163
      thd->lex->sql_command= save_sql_command;
3140
3164
      *nextp= m_ip+1;
 
3165
    }
3141
3166
    thd->set_query(query_backup);
3142
3167
    thd->query_name_consts= 0;
3143
3168