bk commit into 6.0-falcon tree (jas:1.2729)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon 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-08-30 18:28:53-04:00, jas@rowvwade. +1 -0
  Purify table pathnames to handle temporary table deletion
  in a more Hakan and pushbuild friendly manner.
  
  (I don't actually know whether this will fix it -- we'll
  just have to wait and see.)

  storage/falcon/StorageHandler.cpp@stripped, 2007-08-30 18:28:45-04:00, jas@rowvwade. +20 -4
    Purify table pathnames to handle temporary table deletion
    in a more Hakan and pushbuild friendly manner.
    
    (I don't actually know whether this will fix it -- we'll
    just have to wait and see.)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.52/storage/falcon/StorageHandler.cpp	2007-08-30 18:29:13 -04:00
+++ 1.53/storage/falcon/StorageHandler.cpp	2007-08-30 18:29:13 -04:00
@@ -42,6 +42,12 @@
 
 #define HASH(address,size)				(int)(((UIPTR) address >> 2) % size)
 
+#ifdef _WIN32
+	static const char SLASH = '\\';
+#else
+	static const char SLASH = '/';
+#endif
+
 struct StorageSavepoint {
 	StorageSavepoint*	next;
 	StorageConnection*	storageConnection;
@@ -465,8 +471,18 @@
 
 StorageTableShare* StorageHandler::findTable(const char* pathname)
 {
+	char filename [1024];
+	char c, prior = 0;
+	char *q = filename;
+	filename[0] = 0;
+	
+	for (const char *p = pathname; (c = *p++); prior = c)
+		if (c != SLASH || c != prior)
+			*q++ = c;
+
+	*q = 0 ;
 	Sync sync(&hashSyncObject, "StorageHandler::findTable");
-	int slot = JString::hash(pathname, tableHashSize);
+	int slot = JString::hash(filename, tableHashSize);
 	StorageTableShare *tableShare;
 
 	if (tables[slot])
@@ -474,7 +490,7 @@
 		sync.lock(Shared);
 		
 		for (tableShare = tables[slot]; tableShare; tableShare = tableShare->collision)
-			if (tableShare->pathName == pathname)
+			if (tableShare->pathName == filename)
 				return tableShare;
 	
 		sync.unlock();
@@ -483,10 +499,10 @@
 	sync.lock(Exclusive);
 	
 	for (tableShare = tables[slot]; tableShare; tableShare = tableShare->collision)
-		if (tableShare->pathName == pathname)
+		if (tableShare->pathName == filename)
 			return tableShare;
 	
-	tableShare = new StorageTableShare(this, pathname, NULL, mySqlLockSize, false);
+	tableShare = new StorageTableShare(this, filename, NULL, mySqlLockSize, false);
 	tableShare->collision = tables[slot];
 	tables[slot] = tableShare;