← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sql/sql_view.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/sql_view.cc
1138
1138
    will be TRUE as far as we make new table cache).
1139
1139
  */
1140
1140
  old_lex= thd->lex;
1141
 
  arena= thd->stmt_arena;
1142
 
  if (arena->is_conventional())
1143
 
    arena= 0;
1144
 
  else
1145
 
    thd->set_n_backup_active_arena(arena, &backup);
 
1141
  arena= thd->activate_stmt_arena_if_needed(&backup);
1146
1142
 
1147
1143
  /* init timestamp */
1148
1144
  if (!table->timestamp.str)
1480
1476
        objects of the view.
1481
1477
      */
1482
1478
      if (!(table->view_sctx= (Security_context *)
1483
 
            thd->stmt_arena->alloc(sizeof(Security_context))))
 
1479
            thd->stmt_arena->calloc(sizeof(Security_context))))
1484
1480
        goto err;
1485
1481
      security_ctx= table->view_sctx;
1486
1482
    }