diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-09 10:04:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-09 10:18:46 +0200 |
| commit | 66c6188a4b21d81b8d882386e0b059c4a6d05224 (patch) | |
| tree | e9f8cfd9d535ae2e56c13f618b39746307923581 /sql/sql_show.cc | |
| parent | 070a8754c44e29572d1fafbfece251ace23ba41d (diff) | |
| download | mariadb-git-66c6188a4b21d81b8d882386e0b059c4a6d05224.tar.gz | |
Relax assertions on shutdown after aborted startup.
A proper InnoDB shutdown after aborted startup was introduced
in commit 81b7fe9d383bdf68a622b95384f067ed68ba342c.
Also related to this is MDEV-11985, making read-only shutdown more robust.
If startup was aborted, there may exist recovered transactions that were
not rolled back. Relax the assertions accordingly.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 58fc2edc6f2..180856d9f16 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -7609,7 +7609,8 @@ 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, - fields_info->field_length))) + std::min(unsigned (strlen(fields_info->field_name)), + fields_info->field_length)))) { DBUG_RETURN(0); } |