Commit 6c123745 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

parents 2c87b349 e2e40c76
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -2364,7 +2364,9 @@ row_sel_field_store_in_mysql_format(

		ut_a(templ->mbmaxlen > templ->mbminlen
			|| templ->mysql_col_len == len);
		ut_a(!templ->mbmaxlen
		/* The following assertion would fail for old tables
		containing UTF-8 ENUM columns due to Bug #9526. */
		ut_ad(!templ->mbmaxlen
			|| !(templ->mysql_col_len % templ->mbmaxlen));
		ut_a(len * templ->mbmaxlen >= templ->mysql_col_len);