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

« back to all changes in this revision

Viewing changes to sql/table.h

  • 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
* 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:
2083
2083
  }
2084
2084
  inline void set_merged_derived()
2085
2085
  {
 
2086
    DBUG_ENTER("set_merged_derived");
2086
2087
    derived_type= ((derived_type & DTYPE_MASK) |
2087
2088
                   DTYPE_TABLE | DTYPE_MERGE);
2088
2089
    set_check_merged();
 
2090
    DBUG_VOID_RETURN;
2089
2091
  }
2090
2092
  inline bool is_materialized_derived()
2091
2093
  {
2093
2095
  }
2094
2096
  void set_materialized_derived()
2095
2097
  {
 
2098
    DBUG_ENTER("set_materialized_derived");
2096
2099
    derived_type= ((derived_type & DTYPE_MASK) |
2097
2100
                   DTYPE_TABLE | DTYPE_MATERIALIZE);
2098
2101
    set_check_materialized();
 
2102
    DBUG_VOID_RETURN;
2099
2103
  }
2100
2104
  inline bool is_multitable()
2101
2105
  {