From: Date: May 30 2008 12:09pm
Subject: commit into mysql-6.0-falcon:mysql-6.0-falcon branch (olav:2683) Bug#36703
List-Archive: http://lists.mysql.com/commits/47247
X-Bug: 36703
Message-Id: <20080530100936.3887.qmail@khepri20>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

 2683 Olav Sandstaa	2008-05-30
      A fix for Bug#36703: Unknown symbol EncodedDataStream::decode when linking mysqld with Sun Studio
      
      The problem was due to Sun Studio compiler produced a different symbol names in the object files for the decode()
      method for the implementation of the method and when it was called.
      This was triggered due to that the declartion of the method used "unsigned char" while the definition of the method used a UCHAR (which is typedef unsigned char). 
      
      Fixed this problem by using UCHAR in both declaration and definition.
modified:
  storage/falcon/EncodedDataStream.h


=== modified file 'storage/falcon/EncodedDataStream.h'
--- a/storage/falcon/EncodedDataStream.h	2008-04-21 16:27:11 +0000
+++ b/storage/falcon/EncodedDataStream.h	2008-05-30 10:09:31 +0000
@@ -31,6 +31,7 @@
 #endif
 
 #include "BigInt.h"
+#include "Engine.h"
 
 #define BYTES_POS(n)   ((n == 0) ? 0 : \
 						(n < (1<<7)) ? 1 : \
@@ -335,7 +336,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)
 		{