diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-09 16:02:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-09 16:02:57 +0200 |
| commit | 5ffbd084f5dc1e7d05fd3172237ed50feef70b18 (patch) | |
| tree | 8099a22723daca70ebffac90a9afa88709c60fce /sql/sql_show.cc | |
| parent | 0e6968c2441769e912b1cf743b158f48206f933e (diff) | |
| download | mariadb-git-5ffbd084f5dc1e7d05fd3172237ed50feef70b18.tar.gz | |
Revert an accidental commit to work around MDEV-11601.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 180856d9f16..58fc2edc6f2 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -7609,8 +7609,7 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list) case MYSQL_TYPE_BLOB: if (!(item= new (mem_root) Item_blob(thd, fields_info->field_name, - std::min(unsigned (strlen(fields_info->field_name)), - fields_info->field_length)))) + fields_info->field_length))) { DBUG_RETURN(0); } |