List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 2 2010 11:34am
Subject:bzr commit into mysql-trunk-innodb branch (marko.makela:3136)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:jimmy.yang@stripped2gd9uxxxvg

 3136 Marko Mäkelä	2010-06-02
      Merge from mysql-5.1-innodb:
      
      ------------------------------------------------------------
      revno: 3493
      revision-id: marko.makela@stripped-60x32xiivtqj9va1
      parent: marko.makela@stripped0100601135802-hgplcpr8089ura8g
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Wed 2010-06-02 13:19:40 +0300
      message:
        fil_print_orphaned_tablespaces(): Unused function, remove.

    modified:
      storage/innobase/fil/fil0fil.c
      storage/innobase/include/fil0fil.h
=== modified file 'storage/innobase/fil/fil0fil.c'
--- a/storage/innobase/fil/fil0fil.c	revid:jimmy.yang@stripped-20100602110400-568a3b2gd9uxxxvg
+++ b/storage/innobase/fil/fil0fil.c	revid:marko.makela@stripped-96fny74sm5os2l2s
@@ -3564,39 +3564,6 @@ next_datadir_item:
 	return(err);
 }
 
-/********************************************************************//**
-If we need crash recovery, and we have called
-fil_load_single_table_tablespaces() and dict_load_single_table_tablespaces(),
-we can call this function to print an error message of orphaned .ibd files
-for which there is not a data dictionary entry with a matching table name
-and space id. */
-UNIV_INTERN
-void
-fil_print_orphaned_tablespaces(void)
-/*================================*/
-{
-	fil_space_t*	space;
-
-	mutex_enter(&fil_system->mutex);
-
-	space = UT_LIST_GET_FIRST(fil_system->space_list);
-
-	while (space) {
-		if (space->purpose == FIL_TABLESPACE && space->id != 0
-		    && !space->mark) {
-			fputs("InnoDB: Warning: tablespace ", stderr);
-			ut_print_filename(stderr, space->name);
-			fprintf(stderr, " of id %lu has no matching table in\n"
-				"InnoDB: the InnoDB data dictionary.\n",
-				(ulong) space->id);
-		}
-
-		space = UT_LIST_GET_NEXT(space_list, space);
-	}
-
-	mutex_exit(&fil_system->mutex);
-}
-
 /*******************************************************************//**
 Returns TRUE if a single-table tablespace does not exist in the memory cache,
 or is being deleted there.

=== modified file 'storage/innobase/include/fil0fil.h'
--- a/storage/innobase/include/fil0fil.h	revid:jimmy.yang@strippedxxvg
+++ b/storage/innobase/include/fil0fil.h	revid:marko.makela@stripped
@@ -506,16 +506,6 @@ UNIV_INTERN
 ulint
 fil_load_single_table_tablespaces(void);
 /*===================================*/
-/********************************************************************//**
-If we need crash recovery, and we have called
-fil_load_single_table_tablespaces() and dict_load_single_table_tablespaces(),
-we can call this function to print an error message of orphaned .ibd files
-for which there is not a data dictionary entry with a matching table name
-and space id. */
-UNIV_INTERN
-void
-fil_print_orphaned_tablespaces(void);
-/*================================*/
 /*******************************************************************//**
 Returns TRUE if a single-table tablespace does not exist in the memory cache,
 or is being deleted there.

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100602113441-96fny74sm5os2l2s.bundle
Thread
bzr commit into mysql-trunk-innodb branch (marko.makela:3136) marko.makela2 Jun