Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 (5c185dfd) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/config/type_ndbapitest.mk.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
		$(top_builddir)/mysys/libmysys.a \
		$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@

		INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
		INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \
		-I$(top_srcdir)/ndb/include \
		-I$(top_srcdir)/ndb/include/ndbapi \
		-I$(top_srcdir)/ndb/include/util \

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		include $(top_srcdir)/ndb/config/common.mk.am

		ndbinclude_HEADERS = \
		ndb_init.h \
		ndb_types.h \
		ndb_version.h

+17 −5

Original line number	Diff line number	Diff line
		/* Copyright (C) 2003 MySQL AB

		This program is free software; you can redistribute it and/or modify
		it under the terms of the GNU General Public License as published by
		the Free Software Foundation; either version 2 of the License, or
		(at your option) any later version.

		This program is distributed in the hope that it will be useful,
		but WITHOUT ANY WARRANTY; without even the implied warranty of
		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		GNU General Public License for more details.

		You should have received a copy of the GNU General Public License
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */

		#ifndef NDBGLOBAL_H
		#define NDBGLOBAL_H
		@@ -96,15 +111,12 @@ extern "C" {

		#include <assert.h>

		/* call in main() - does not return on error */
		extern int ndb_init(void);
		extern void ndb_end(int);
		#define NDB_INIT(prog_name) {my_progname=(prog_name); ndb_init();}

		#ifdef __cplusplus
		}
		#endif

		#include "ndb_init.h"

		#ifdef SCO

		#ifndef PATH_MAX

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/* Copyright (C) 2003 MySQL AB

		This program is free software; you can redistribute it and/or modify
		it under the terms of the GNU General Public License as published by
		the Free Software Foundation; either version 2 of the License, or
		(at your option) any later version.

		This program is distributed in the hope that it will be useful,
		but WITHOUT ANY WARRANTY; without even the implied warranty of
		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		GNU General Public License for more details.

		You should have received a copy of the GNU General Public License
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */


		#ifndef NDB_INIT_H
		#define NDB_INIT_H

		#ifdef __cplusplus
		extern "C" {
		#endif
		/* call in main() - does not return on error */
		extern int ndb_init(void);
		extern void ndb_end(int);
		#define NDB_INIT(prog_name) {my_progname=(prog_name); ndb_init();}
		#ifdef __cplusplus
		}
		#endif

		#endif

+0 −15

Original line number	Diff line number	Diff line
		@@ -182,27 +182,12 @@ public:
		/**
		* Get blob parts table name. Useful only to test programs.
		*/
		STATIC_CONST( BlobTableNameSize = 40 );
		static int getBlobTableName(char* btname, Ndb* anNdb, const char* tableName, const char* columnName);
		/**
		* Return error object. The error may be blob specific (below) or may
		* be copied from a failed implicit operation.
		*/
		const NdbError& getNdbError() const;
		// "Invalid blob attributes or invalid blob parts table"
		STATIC_CONST( ErrTable = 4263 );
		// "Invalid usage of blob attribute"
		STATIC_CONST( ErrUsage = 4264 );
		// "Method is not valid in current blob state"
		STATIC_CONST( ErrState = 4265 );
		// "Invalid blob seek position"
		STATIC_CONST( ErrSeek = 4266 );
		// "Corrupted blob value"
		STATIC_CONST( ErrCorrupt = 4267 );
		// "Error in blob head update forced rollback of transaction"
		STATIC_CONST( ErrAbort = 4268 );
		// "Unknown blob error"
		STATIC_CONST( ErrUnknown = 4269 );
		/**
		* Return info about all blobs in this operation.
		*/