diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-11-15 22:11:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-11-15 22:11:03 +0200 |
| commit | 94897a6394a6f05f22c2b755893f14c92aa5f591 (patch) | |
| tree | c4b4f316e0d52ca6a4c08d509fb7b3eacef363d7 /storage/innobase | |
| parent | 20bbc6f7e7b36f2247f33558f9ecaf40a61289e5 (diff) | |
| parent | e882efe64a17f7e0c0bb45b7b69db6cd24cf04e3 (diff) | |
| download | mariadb-git-94897a6394a6f05f22c2b755893f14c92aa5f591.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index dcd5b510f0a..2bc3cf0f835 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -101,8 +101,6 @@ innobase_col_to_mysql( ut_ad(flen >= len); ut_ad(DATA_MBMAXLEN(col->mbminmaxlen) >= DATA_MBMINLEN(col->mbminmaxlen)); - ut_ad(DATA_MBMAXLEN(col->mbminmaxlen) - > DATA_MBMINLEN(col->mbminmaxlen) || flen == len); memcpy(dest, data, len); break; |