database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

fix ndb odbc compile

Browse Source 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2004-05-18 09:58:30 +02:00
parent e858cd9642
commit d6cf9dd9b7
9 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

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

1
ndb/src/client/odbc/codegen/SimpleParser.cpp
View File

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

1
ndb/src/client/odbc/common/Ctx.cpp
View File

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

1
ndb/src/client/odbc/common/DataField.cpp
View File

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

1
ndb/src/client/odbc/common/OdbcData.cpp
View File

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

4
ndb/src/client/odbc/common/common.hpp
View File

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

2
ndb/src/client/odbc/handles/PoolNdb.hpp
View File

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

2
ndb/test/odbc/driver/testOdbcDriver.cpp
View File

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

1
ndb/tools/ndbsql/ndbsql.cpp
View File

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