Merge mysql-5.1 to mysql-5.5.

f481e6fa · Marko Mäkelä · 49b51dd2 · 26226e34 · f481e6fa
Commit f481e6fa authored Nov 15, 2012 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

storage/innobase/handler/handler0alter.cc storage/innobase/handler/handler0alter.cc +0 -2

No files found.
--- 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;