Commit fe0037b9 authored by Marko Mäkelä's avatar Marko Mäkelä

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.
parent 570a4ae8
...@@ -1694,6 +1694,7 @@ dict_load_table( ...@@ -1694,6 +1694,7 @@ dict_load_table(
/* Try to open the tablespace */ /* Try to open the tablespace */
if (!fil_open_single_table_tablespace( if (!fil_open_single_table_tablespace(
TRUE, table->space, TRUE, table->space,
table->flags == DICT_TF_COMPACT ? 0 :
table->flags & ~(~0 << DICT_TF_BITS), name)) { table->flags & ~(~0 << DICT_TF_BITS), name)) {
/* We failed to find a sensible /* We failed to find a sensible
tablespace file */ tablespace file */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment