bzr push into mysql-trunk-innodb branch (marko.makela:3107 to 3108) Bug#54658

[marko.makela]

 3108 Marko Mäkelä	2010-06-21
      Merge Bug #54658 fix from mysql-5.1-innodb:
      ------------------------------------------------------------
      revno: 3515
      revision-id: marko.makela@strippeda153s3f09merw
      parent: vasil.dimov@stripped18085155-xnm469cbhedqea96
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Mon 2010-06-21 12:40:08 +0300
      message:
        Bug #54658: InnoDB: Warning: allocated tablespace %lu, old maximum was 0
      
        dict_check_tablespaces_and_store_max_id(): Initialize max_space_id
        and fil_system->max_assigned_id from DICT_HDR_MAX_SPACE_ID.
      
        fil_space_create(): Suppress the warning unless !recv_recovery_on
        (do not complain while applying the redo log).

    modified:
      storage/innobase/dict/dict0load.c
      storage/innobase/fil/fil0fil.c
 3107 Vasil Dimov	2010-06-17
      Adjust innodb_mysql.result after the resolved conflict from the merge

    modified:
      mysql-test/suite/innodb/r/innodb_mysql.result
=== modified file 'storage/innobase/dict/dict0load.c'
--- a/storage/innobase/dict/dict0load.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/dict/dict0load.c	revid:[e-mail]-20100621103239-vjsbfe9oyj51ngew
@@ -644,7 +644,7 @@ dict_check_tablespaces_and_store_max_id(
 	dict_index_t*	sys_index;
 	btr_pcur_t	pcur;
 	const rec_t*	rec;
-	ulint		max_space_id	= 0;
+	ulint		max_space_id;
 	mtr_t		mtr;
 
 	mutex_enter(&(dict_sys->mutex));
@@ -655,6 +655,11 @@ dict_check_tablespaces_and_store_max_id(
 	sys_index = UT_LIST_GET_FIRST(sys_tables->indexes);
 	ut_a(!dict_table_is_comp(sys_tables));
 
+	max_space_id = mtr_read_ulint(dict_hdr_get(&mtr)
+				      + DICT_HDR_MAX_SPACE_ID,
+				      MLOG_4BYTES, &mtr);
+	fil_set_max_space_id_if_bigger(max_space_id);
+
 	btr_pcur_open_at_index_side(TRUE, sys_index, BTR_SEARCH_LEAF, &pcur,
 				    TRUE, &mtr);
 loop:

=== modified file 'storage/innobase/fil/fil0fil.c'
--- a/storage/innobase/fil/fil0fil.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/fil/fil0fil.c	revid:marko.makela@stripped100621103239-vjsbfe9oyj51ngew
@@ -1214,7 +1214,7 @@ try_again:
 	space->tablespace_version = fil_system->tablespace_version;
 	space->mark = FALSE;
 
-	if (UNIV_LIKELY(purpose == FIL_TABLESPACE)
+	if (UNIV_LIKELY(purpose == FIL_TABLESPACE && !recv_recovery_on)
 	    && UNIV_UNLIKELY(id > fil_system->max_assigned_id)) {
 		if (!fil_system->space_id_reuse_warned) {
 			fil_system->space_id_reuse_warned = TRUE;

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