mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
Merge a change from mysql-5.1-innodb:
------------------------------------------------------------ revno: 3503 revision-id: marko.makela@oracle.com-20100608121041-l7t9r6lrpx6lh361 parent: marko.makela@oracle.com-20100608114055-7b04ytuqz0lde6v1 committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Tue 2010-06-08 15:10:41 +0300 message: Bug#54009: Server crashes when data is selected from non backed up table for InnoDB plugin dict_load_table(): Pass the correct tablespace flags to fil_open_single_table_tablespace(). For ROW_FORMAT=COMPACT and REDUNDANT, the tablespace flags are 0. The table flags would be 0 or DICT_TF_COMPACT.
This commit is contained in:
parent
570a4ae8fe
commit
fe0037b996
1 changed files with 1 additions and 0 deletions
|
@ -1694,6 +1694,7 @@ err_exit:
|
|||
/* Try to open the tablespace */
|
||||
if (!fil_open_single_table_tablespace(
|
||||
TRUE, table->space,
|
||||
table->flags == DICT_TF_COMPACT ? 0 :
|
||||
table->flags & ~(~0 << DICT_TF_BITS), name)) {
|
||||
/* We failed to find a sensible
|
||||
tablespace file */
|
||||
|
|
Loading…
Reference in a new issue