← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/innobase/handler/handler0alter.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:
storage/innobase/handler/handler0alter.cc
110
110
                /* These column types should never be shipped to MySQL. */
111
111
                ut_ad(0);
112
112
 
113
 
        case DATA_FIXBINARY:
114
113
        case DATA_FLOAT:
115
114
        case DATA_DOUBLE:
116
115
        case DATA_DECIMAL:
117
116
                /* Above are the valid column types for MySQL data. */
118
117
                ut_ad(flen == len);
119
118
                /* fall through */
 
119
        case DATA_FIXBINARY:
120
120
        case DATA_CHAR:
121
121
                /* We may have flen > len when there is a shorter
122
 
                prefix on a CHAR column. */
 
122
                prefix on the CHAR and BINARY column. */
123
123
                ut_ad(flen >= len);
124
124
#else /* UNIV_DEBUG */
125
125
        default: