commit into mysql-6.0-falcon branch (olav:2712) Bug#36403

[Olav Sandstaa]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/

 2712 Olav Sandstaa	2008-06-19
      Temporary work-around for Bug#36403 Compiling Falcon on Solaris fails due to dtrace
      
      To avoid that other people compiling on Solaris have problems with linking
      the two DTrace probes found in Falcon we temporarily comment these out
      of the code.
      
      Before these should be enabled again there need to be done some work
      on how configure and make do linking of DTrace probes for the storage
      engines. 
modified:
  storage/falcon/ha_falcon.cpp


=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-06-02 11:19:39 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-06-19 12:39:21 +0000
@@ -457,7 +457,8 @@
 {
 	DBUG_ENTER("StorageInterface::open");
 
-	FALCON_OPEN();
+	// Temporarily comment out DTrace probes in Falcon, see bug #36403
+	// FALCON_OPEN();
 
 	if (!mySqlThread)
 		mySqlThread = current_thd;
@@ -534,7 +535,9 @@
 		storageTable->clearTruncateLock();
 
 	unmapFields();
-	FALCON_CLOSE();
+
+	// Temporarily comment out DTrace probes in Falcon, see bug #36403
+	// FALCON_CLOSE();
 
 	DBUG_RETURN(0);
 }