bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3124)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedr1

 3124 Magnus Blåudd	2010-11-15 [merge]
      Merge 7.0 -> 5.5-telco-7.0

    modified:
      storage/ndb/include/ndb_global.h
=== modified file 'storage/ndb/include/ndb_global.h'
--- a/storage/ndb/include/ndb_global.h	2010-11-11 13:19:26 +0000
+++ b/storage/ndb/include/ndb_global.h	2010-11-15 15:03:18 +0000
@@ -46,7 +46,6 @@
 #define NDB_WIN 1
 #define PATH_MAX 256
 #define DIR_SEPARATOR "\\"
-#define HAVE_STRCASECMP
 #pragma warning(disable: 4503 4786)
 #else
 #undef NDB_WIN32
@@ -107,11 +106,6 @@
 extern char * strdup(const char *s);
 #endif
 
-#ifndef HAVE_STRCASECMP
-extern int strcasecmp(const char *s1, const char *s2);
-extern int strncasecmp(const char *s1, const char *s2, size_t n);
-#endif
-
 static const char table_name_separator =  '/';
 
 #if defined(_AIX) || defined(WIN32) || defined(NDB_VC98)

No bundle (reason: revision is a merge).