bk commit into 6.0 tree (jas:1.2756)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 repository of . When  does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-17 10:38:27-05:00, jas@rowvwade. +1 -0
  The table space manager should not automatically open repository
  volumes -- that managed by the RepositoryVolume instead.

  storage/falcon/TableSpaceManager.cpp@stripped, 2007-12-17 10:38:18-05:00, jas@rowvwade. +10
-9
    The table space manager should not automatically open repository
    volumes -- that managed by the RepositoryVolume instead.

diff -Nrup a/storage/falcon/TableSpaceManager.cpp b/storage/falcon/TableSpaceManager.cpp
--- a/storage/falcon/TableSpaceManager.cpp	2007-12-04 16:16:24 -05:00
+++ b/storage/falcon/TableSpaceManager.cpp	2007-12-17 10:38:18 -05:00
@@ -112,16 +112,17 @@ TableSpace* TableSpaceManager::findTable
 		int type = resultSet->getInt(3);
 		tableSpace = new TableSpace(database, name, id, fileName, 0, type);
 
-		try
-			{
-			tableSpace->open();
-			}
-		catch (...)
-			{
-			delete tableSpace;
+		if (type != TABLESPACE_TYPE_REPOSITORY)
+			try
+				{
+				tableSpace->open();
+				}
+			catch (...)
+				{
+				delete tableSpace;
 
-			throw;
-			}
+				throw;
+				}
 
 		add(tableSpace);
 		}