fix ndb odbc compile

BitKeeper/etc/logging_ok

@@ -121,6 +121,7 @@ paul@ice.local
 paul@ice.snake.net
 paul@kite-hub.kitebird.com
 paul@teton.kitebird.com
+pekka@mysql.com
 pem@mysql.com
 peter@linux.local
 peter@mysql.com

ndb/src/client/odbc/codegen/SimpleParser.cpp

@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <common/common.hpp>
 #include <NdbMutex.h>
 #include <common/StmtArea.hpp>
 #include <FlexLexer.h>

ndb/src/client/odbc/common/Ctx.cpp

@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <ndb_global.h>
 #include <NdbApi.hpp>
 #include <common/common.hpp>
 #include "DiagArea.hpp"

ndb/src/client/odbc/common/DataField.cpp

@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <ndb_global.h>
 #include "DataField.hpp"
 
 #ifndef INT_MAX

ndb/src/client/odbc/common/OdbcData.cpp

@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <ndb_global.h>
 #include "OdbcData.hpp"
 
 OdbcData::OdbcData() :

ndb/src/client/odbc/common/common.hpp

@@ -17,6 +17,10 @@
 #ifndef ODBC_COMMON_common_hpp
 #define ODBC_COMMON_common_hpp
 
+#define stpcpy stpcpy
+#include <ndb_global.h>
+#undef swap
+
 // misc defs
 
 #ifdef NDB_GCC // only for odbc

ndb/src/client/odbc/handles/PoolNdb.hpp

@@ -17,8 +17,8 @@
 #ifndef ODBC_HANDLES_PoolNdb_hpp
 #define ODBC_HANDLES_PoolNdb_hpp
 
-#include <list>
 #include <common/common.hpp>
+#include <list>
 
 class Ndb;
 

ndb/test/odbc/driver/testOdbcDriver.cpp

@@ -37,6 +37,7 @@
  */
 
 #include <ndb_global.h>
+#undef test
 #include <ndb_version.h>
 #include <kernel/ndb_limits.h>
 #include <Bitmask.hpp>
@@ -1281,6 +1282,7 @@ struct Fld {
 	    return test.verify(m_double, m_ind, fld.m_double, fld.m_ind);
 	}
 	assert(false);
+	return false;
     }
     // debug
     void print() const {

ndb/tools/ndbsql/ndbsql.cpp

@@ -138,6 +138,7 @@ bool emptyString(const char* s) {
  * to obtain the row count.
  */
 #define MAXCOLS 100
+#undef max
 #define max(a,b) ((a)>(b)?(a):(b))
 
 #define MAX_MESSAGE	500