← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mysql-5.5/quantal-updates

« back to all changes in this revision

Viewing changes to storage/innobase/handler/handler0alter.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-01-16 10:11:37 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20130116101137-w2lant30o21mzi0b
Tags: 5.5.29-0ubuntu0.12.10.1
https://launchpad.net/bugs/1100264
* SECURITY UPDATE: Update to 5.5.29 to fix security issues (LP: #1100264)
  - http://www.oracle.com/technetwork/topics/security/cpujan2013-1515902.html
* debian/patches/CVE-2012-5611.patch: removed, included upstream.
* debian/patches/38_scripts__mysqld_safe.sh__signals.patch: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/handler0alter.cc
112
112
                /* These column types should never be shipped to MySQL. */
113
113
                ut_ad(0);
114
114
 
115
 
        case DATA_CHAR:
116
115
        case DATA_FIXBINARY:
117
116
        case DATA_FLOAT:
118
117
        case DATA_DOUBLE:
119
118
        case DATA_DECIMAL:
120
119
                /* Above are the valid column types for MySQL data. */
121
120
                ut_ad(flen == len);
 
121
                /* fall through */
 
122
        case DATA_CHAR:
 
123
                /* We may have flen > len when there is a shorter
 
124
                prefix on a CHAR column. */
 
125
                ut_ad(flen >= len);
122
126
#else /* UNIV_DEBUG */
123
127
        default:
124
128
#endif /* UNIV_DEBUG */
151
155
 
152
156
                field->reset();
153
157
 
154
 
                ipos = dict_index_get_nth_col_pos(index, i);
 
158
                ipos = dict_index_get_nth_col_or_prefix_pos(index, i, TRUE);
155
159
 
156
160
                if (UNIV_UNLIKELY(ipos == ULINT_UNDEFINED)) {
157
161
null_field: