bzr commit into mysql-5.1-telco-6.2 branch (monty:2633)

[Monty Taylor]

#At http://bazaar.launchpad.net/~mordred/mysql-server/5.1-telco-6.2

 2633 Monty Taylor	2008-07-16
      Fixed two header warnings.
modified:
  include/my_global.h
  include/mysql_com.h

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2008-03-28 10:14:27 +0000
+++ b/include/my_global.h	2008-07-16 14:23:45 +0000
@@ -235,6 +235,7 @@
   now let's figure out if inline functions are supported
   autoconf defines 'inline' to be empty, if not
 */
+#define inline1 0
 #define inline_test_1(X)        X ## 1
 #define inline_test_2(X)        inline_test_1(X)
 #if inline_test_2(inline) != 1
@@ -242,6 +243,7 @@
 #endif
 #undef inline_test_2
 #undef inline_test_1
+#undef inline1
 /* helper macro for "instantiating" inline functions */
 #define STATIC_INLINE static inline
 

=== modified file 'include/mysql_com.h'
--- a/include/mysql_com.h	2008-04-08 08:31:46 +0000
+++ b/include/mysql_com.h	2008-07-16 14:23:45 +0000
@@ -486,9 +486,6 @@ const char *mysql_errno_to_sqlstate(unsi
 
 /* Some other useful functions */
 
-my_bool my_thread_init(void);
-void my_thread_end(void);
-
 #ifdef _global_h
 ulong STDCALL net_field_length(uchar **packet);
 my_ulonglong net_field_length_ll(uchar **packet);