List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 8 2010 12:27pm
Subject:bzr push into mysql-trunk-innodb branch (marko.makela:3097 to 3098) Bug#54009
View as plain text  
 3098 Marko Mäkelä	2010-06-08
      Merge a change from mysql-5.1-innodb:
      ------------------------------------------------------------
      revno: 3503
      revision-id: marko.makela@strippedx6lh361
      parent: marko.makela@stripped055-7b04ytuqz0lde6v1
      committer: Marko Mäkelä <marko.makela@stripped>
      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.

    modified:
      storage/innobase/dict/dict0load.c
 3097 Marko Mäkelä	2010-06-08
      Merge a change from mysql-5.1-innodb:
      ------------------------------------------------------------
      revno: 3502
      revision-id: marko.makela@strippedlde6v1
      parent: jimmy.yang@stripped-itzduhwgbw0b8nlh
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Tue 2010-06-08 14:40:55 +0300
      message:
        buf_page_get_gen(): Pass file,line to rw_lock_x_lock().

    modified:
      storage/innobase/buf/buf0buf.c
=== modified file 'storage/innobase/dict/dict0load.c'
--- a/storage/innobase/dict/dict0load.c	revid:marko.makela@oracle.com-20100608114734-zr70kxe26ztgwbat
+++ b/storage/innobase/dict/dict0load.c	revid:marko.makela@stripped00608122645-psnrclg7j7n1ynvs
@@ -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 */

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100608122645-psnrclg7j7n1ynvs.bundle
Thread
bzr push into mysql-trunk-innodb branch (marko.makela:3097 to 3098) Bug#54009marko.makela8 Jun