← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to sql/sql_base.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
http://bugs.debian.org/745330
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_base.cc
1939
1939
  DBUG_PRINT("info", ("real table: %s.%s", d_name, t_name));
1940
1940
  for (TABLE_LIST *tl= table_list;;)
1941
1941
  {
 
1942
    if (tl &&
 
1943
        tl->select_lex && tl->select_lex->master_unit() &&
 
1944
        tl->select_lex->master_unit()->executed)
 
1945
    {
 
1946
      /*
 
1947
        There is no sense to check tables of already executed parts
 
1948
        of the query
 
1949
      */
 
1950
      tl= tl->next_global;
 
1951
      continue;
 
1952
    }
1942
1953
    /*
1943
1954
      Table is unique if it is present only once in the global list
1944
1955
      of tables and once in the list of table locks.