mirror of
https://github.com/MariaDB/server.git
synced 2025-02-22 21:33:08 +01:00
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
commit
6c1237455d
1 changed files with 3 additions and 1 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue