RE: bzr commit into mysql-6.0-falcon branch (lars-erik.bjork:2742) Bug#36620

[Kevin Lewis]

Patch looks good. OK to push

>-----Original Message-----
>From: lars-erik.bjork@stripped [mailto:lars-erik.bjork@stripped]
>Sent: Thursday, July 10, 2008 4:02 AM
>To: commits@stripped
>Subject: bzr commit into mysql-6.0-falcon branch (lars-erik.bjork:2742)
>Bug#36620
>
>#At file:///home/lb200670/devel/mysql-shared/mysql-6.0-falc-test/
>
> 2742 lars-erik.bjork@stripped	2008-07-10
>      bug#36620 - Legacy leftovers in Falcon startup I/O
>
>      Preventing Falcon from accessing falcon.conf (old netfrastructure
>config file)
>      and from reading, creating and unlinking netfrastructure specific
>symlinks.
>modified:
>  storage/falcon/Configuration.cpp
>  storage/falcon/Connection.cpp
>
>per-file messages:
>  storage/falcon/Configuration.cpp
>    Preventing Falcon from accessing falcon.conf (old netfrastructure
config
>file)
>  storage/falcon/Connection.cpp
>    Preventing Falcon from reading, creating and unlinking netfrastructure
>specific symlinks
>=== modified file 'storage/falcon/Configuration.cpp'
>--- a/storage/falcon/Configuration.cpp	2008-07-03 11:24:12 +0000
>+++ b/storage/falcon/Configuration.cpp	2008-07-10 09:01:32 +0000
>@@ -180,6 +180,7 @@ Configuration::Configuration(const char
> 	gcSchedule = "0,30 * * * * *";
> 	useCount = 1;
>
>+#ifndef STORAGE_ENGINE
> 	// Handle initialization file
>
> 	const char *fileName = (configFile) ? configFile : CONFIG_FILE;
>@@ -259,6 +260,7 @@ Configuration::Configuration(const char
>
> 		fclose (file);
> 		}
>+#endif
>
> 	pageCacheSize = MAX(pageCacheSize, MIN_PAGE_CACHE);
> 	setRecordMemoryMax(recordMemoryMax);
>
>=== modified file 'storage/falcon/Connection.cpp'
>--- a/storage/falcon/Connection.cpp	2008-02-25 12:17:55 +0000
>+++ b/storage/falcon/Connection.cpp	2008-07-10 09:01:32 +0000
>@@ -923,7 +923,7 @@ void Connection::openDatabase(const char
> 	if (filename)
> 		IO::expandFileName(filename, sizeof(dbFileName),
dbFileName);
> 	else
>-		{
>+		{
> 		if (!registry.findDatabase (dbName, sizeof (dbFileName),
>dbFileName))
> 			throw SQLEXCEPTION (CONNECTION_ERROR, "can't find
>database \"%s\"", dbName);
> 		}
>@@ -1030,7 +1030,9 @@ Database* Connection::createDatabase(con
> 	Sync sync (&databaseList, "Connection::createDatabase");
> 	sync.lock (Exclusive);
>
>+#ifndef STORAGE_ENGINE
> 	if (!registry.findDatabase (dbName, sizeof (dbFileName),
dbFileName))
>+#endif
> 		for (Database *db = firstDatabase; db; db = db->next)
> 			if (db->matches (fileName))
> 				{
>@@ -1039,28 +1041,18 @@ Database* Connection::createDatabase(con
> 				break;
> 				}
>
>-	try
>-		{
>-		registry.defineDatabase (dbName, fileName);
>-
>-		if (!registry.findDatabase (dbName, sizeof (dbFileName),
>dbFileName))
>-			strcpy(dbFileName, fileName);
>-		}
>-	catch(...)
>-		{
> #ifdef STORAGE_ENGINE
>-		strcpy(dbFileName, fileName);
>+        strcpy(dbFileName, fileName);
> #else
>-		throw;
>+	registry.defineDatabase (dbName, fileName);
>+
>+	if (!registry.findDatabase (dbName, sizeof (dbFileName),
dbFileName))
>+		strcpy(dbFileName, fileName);
>+
> #endif
>-		}
>
> 	database = new Database (dbName, configuration, threads);
>
>-#ifdef STORAGE_ENGINE
>-	//strcpy(dbFileName, fileName);
>-#endif
>-
> 	try
> 		{
> 		database->createDatabase (dbFileName);
>
>
>--
>MySQL Code Commits Mailing List
>For list archives: http://lists.mysql.com/commits
>To unsubscribe:    http://lists.mysql.com/commits?unsub=1