bzr push into mysql-5.1-innodb branch (marko.makela:3502 to 3504) Bug#54009

[marko.makela]

 3504 Marko Mäkelä	2010-06-08
      Document Bug#54009 in the InnoDB Plugin ChangeLog.

    modified:
      storage/innodb_plugin/ChangeLog
 3503 Marko Mäkelä	2010-06-08
      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/innodb_plugin/dict/dict0load.c
 3502 Marko Mäkelä	2010-06-08
      buf_page_get_gen(): Pass file,line to rw_lock_x_lock().

    modified:
      storage/innodb_plugin/buf/buf0buf.c
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:marko.makela@stripped04ytuqz0lde6v1
+++ b/storage/innodb_plugin/ChangeLog	revid:marko.makela@stripped
@@ -1,3 +1,9 @@
[phone]	The InnoDB Team
+
+	* dict/dict0load.c:
+	Fix Bug#54009 Server crashes when data is selected from non backed
+	up table for InnoDB plugin
+
 2010-06-02	The InnoDB Team
 
 	* include/db0err.h, include/lock0lock.h, include/row0mysql.h,

=== modified file 'storage/innodb_plugin/dict/dict0load.c'
--- a/storage/innodb_plugin/dict/dict0load.c	revid:marko.makela@stripped0100608114055-7b04ytuqz0lde6v1
+++ b/storage/innodb_plugin/dict/dict0load.c	revid:marko.makela@stripped121215-4mbisu3fyk3reuyq
@@ -973,6 +973,7 @@ err_exit:
 			/* Try to open the tablespace */
 			if (!fil_open_single_table_tablespace(
 				    TRUE, space,
+				    flags == DICT_TF_COMPACT ? 0 :
 				    flags & ~(~0 << DICT_TF_BITS), name)) {
 				/* We failed to find a sensible
 				tablespace file */

Attachment: [text/bzr-bundle] bzr/[e-mail]