diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-10-22 22:13:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-10-22 22:13:26 +0300 |
| commit | 51f3dddf449e635e7392e9e95ee7b826af4078d8 (patch) | |
| tree | 4ed5c2d7b5238d409970b74cf40ad9e3a2d97afa | |
| parent | a87a0da68889b081c7e26aa829069a0619547028 (diff) | |
| parent | 507ffd4afce1d512debab6d79e552969cbb6f12b (diff) | |
| download | mariadb-git-51f3dddf449e635e7392e9e95ee7b826af4078d8.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 06598481d9f..dcd5b510f0a 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -112,13 +112,17 @@ innobase_col_to_mysql( /* These column types should never be shipped to MySQL. */ ut_ad(0); - case DATA_CHAR: case DATA_FIXBINARY: case DATA_FLOAT: case DATA_DOUBLE: case DATA_DECIMAL: /* Above are the valid column types for MySQL data. */ ut_ad(flen == len); + /* fall through */ + case DATA_CHAR: + /* We may have flen > len when there is a shorter + prefix on a CHAR column. */ + ut_ad(flen >= len); #else /* UNIV_DEBUG */ default: #endif /* UNIV_DEBUG */ |