commit into mysql-6.0-falcon:mysql-6.0-falcon branch (JimStarkeyjstarkey:2684)

[JimStarkeyjstarkey]

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

 2684 Jim Starkey	2008-06-03 [merge]
      Trying to a do a trial push of inactive code (skeleton for on-line backup)
removed:
  vio/CMakeFiles/generate.stamp
modified:
  storage/falcon/EncodedDataStream.cpp
  storage/falcon/EncodedDataStream.h
  storage/falcon/Engine.h
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h

=== modified file 'storage/falcon/EncodedDataStream.cpp'
--- a/storage/falcon/EncodedDataStream.cpp	2008-05-14 18:39:57 +0000
+++ b/storage/falcon/EncodedDataStream.cpp	2008-05-30 15:40:29 +0000
@@ -89,7 +89,7 @@
 	stream = strm;
 }
 
-EncodedDataStream::EncodedDataStream(const unsigned char *data, uint length)
+EncodedDataStream::EncodedDataStream(const UCHAR *data, uint length)
 {
 	ptr = data;
 	end = data + length;

=== modified file 'storage/falcon/EncodedDataStream.h'
--- a/storage/falcon/EncodedDataStream.h	2008-05-29 22:49:01 +0000
+++ b/storage/falcon/EncodedDataStream.h	2008-06-03 15:42:16 +0000
@@ -30,8 +30,14 @@
 typedef long long	INT64;
 #endif
 
+#ifndef UCHAR_DEFINED
+#define UCHAR_DEFINED
+typedef unsigned char	UCHAR;
+#endif
+
 #include "BigInt.h"
 
+
 #define BYTES_POS(n)   ((n == 0) ? 0 : \
 						(n < (1<<7)) ? 1 : \
 						(n < (1<<15)) ? 2 : \
@@ -306,7 +312,7 @@
 public:
 	EncodedDataStream();
 	EncodedDataStream (Stream *stream);
-	EncodedDataStream(const unsigned char *data, uint length);
+	EncodedDataStream(const UCHAR* data, uint length);
 	virtual ~EncodedDataStream();
 
 	virtual void	encodeDouble (double dbl);
@@ -336,7 +342,7 @@
 	void			encode (int type, Value *value);
 	
 	static int		init(void);
-	static const unsigned char* decode (const unsigned char *ptr, Value *value, bool
copyFlag);
+	static const UCHAR* decode (const UCHAR *ptr, Value *value, bool copyFlag);
 
 	inline static const unsigned char* skip (const unsigned char *ptr)
 		{

=== modified file 'storage/falcon/Engine.h'
--- a/storage/falcon/Engine.h	2008-04-09 01:36:46 +0000
+++ b/storage/falcon/Engine.h	2008-05-30 15:40:29 +0000
@@ -110,7 +110,11 @@
 typedef unsigned long	UIPTR;
 #endif
 
+#ifndef UCHAR_DEFINED
+#define UCHAR_DEFINED
 typedef unsigned char	UCHAR;
+#endif
+
 typedef unsigned long	ULONG;
 typedef unsigned short	USHORT;
 

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-05-21 14:58:08 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-06-02 11:19:39 +0000
@@ -440,7 +440,7 @@
 		storageConnection = NULL;
 		}
 
-	delete [] fieldMap;
+	unmapFields();
 }
 
 int StorageInterface::rnd_init(bool scan)
@@ -533,6 +533,7 @@
 	if (storageTable)
 		storageTable->clearTruncateLock();
 
+	unmapFields();
 	FALCON_CLOSE();
 
 	DBUG_RETURN(0);
@@ -3442,6 +3443,7 @@
 void StorageInterface::mapFields(TABLE *table)
 {
 	maxFields = storageShare->format->maxId;
+	unmapFields();
 	fieldMap = new Field*[maxFields];
 	memset(fieldMap, 0, sizeof(fieldMap[0]) * maxFields);
 	char nameBuffer[129];
@@ -3457,6 +3459,15 @@
 		}
 }
 
+void StorageInterface::unmapFields(void)
+{
+	if (fieldMap)
+		{
+		delete []fieldMap;
+		fieldMap = NULL;
+		}
+}
+
 static MYSQL_SYSVAR_STR(serial_log_dir, falcon_serial_log_dir,
   PLUGIN_VAR_RQCMDARG| PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC,
   "Falcon serial log file directory.",

=== modified file 'storage/falcon/ha_falcon.h'
--- a/storage/falcon/ha_falcon.h	2008-05-06 21:57:29 +0000
+++ b/storage/falcon/ha_falcon.h	2008-06-02 11:19:39 +0000
@@ -128,6 +128,7 @@
 	void			unlockTable(void);
 	void			checkBinLog(void);
 	void			mapFields(TABLE *table);
+	void			unmapFields(void);
 
 	static StorageConnection* getStorageConnection(THD* thd);
 	

=== removed file 'vio/CMakeFiles/generate.stamp'
--- a/vio/CMakeFiles/generate.stamp	2008-05-09 14:10:45 +0000
+++ b/vio/CMakeFiles/generate.stamp	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-# CMake generation timestamp file this directory.