bzr push into mysql-5.1-innodb branch (marko.makela:3514 to 3516) Bug#54658

[marko.makela]

 3516 Marko Mäkelä	2010-06-21
      Bug#54658: Add ChangeLog entry

    modified:
      storage/innodb_plugin/ChangeLog
 3515 Marko Mäkelä	2010-06-21
      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/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/fil/fil0fil.c
 3514 Vasil Dimov	2010-06-18 [merge]
      Merge mysql-5.1-innodb from bk-internal to my local repo

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innodb_plugin/row/row0merge.c
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/ChangeLog	revid:[e-mail]-20100621095148-8g73k8k68dpj080u
@@ -1,3 +1,9 @@
[phone]	The InnoDB Team
+
+	* dict/dict0load.c, fil/fil0fil.c:
+	Fix Bug#54658: InnoDB: Warning: allocated tablespace %lu,
+	old maximum was 0 (introduced in Bug #53578 fix)
+
 2010-06-16	The InnoDB Team
 
 	* row/row0merge.c:

=== modified file 'storage/innodb_plugin/dict/dict0load.c'
--- a/storage/innodb_plugin/dict/dict0load.c	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/dict/dict0load.c	revid:marko.makela@stripped
@@ -316,7 +316,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));
@@ -327,6 +327,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/innodb_plugin/fil/fil0fil.c'
--- a/storage/innodb_plugin/fil/fil0fil.c	revid:vasil.dimov@strippededqea96
+++ b/storage/innodb_plugin/fil/fil0fil.c	revid:marko.makela@stripped
@@ -1197,7 +1197,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]