database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-05-21 07:36:35 +03:00
parent 84dd2437c5 82d7419e06
commit 1c7209e828
71 changed files with 810 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_admin.cc
View File

@@ -987,8 +987,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
types here.
*/
enum enum_field_types type= field->type();
if (type < MYSQL_TYPE_TINY_BLOB ||
type > MYSQL_TYPE_BLOB)
if ((type < MYSQL_TYPE_TINY_BLOB ||
type > MYSQL_TYPE_BLOB) &&
field->field_length <= thd->variables.analyze_max_length)
{
field->register_field_in_read_map();
bitmap_set_bit(&tab->has_value_set, field->field_index);