Commit 9226d140 authored Jan 19, 2005 by unknown

Merge mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged

parents 1c5dbc67 5af0ea43

ndb/include/kernel/AttributeHeader.hpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#ifndef ATTRIBUTE_HEADER
		#define ATTRIBUTE_HEADER

		#include <new>
		/**
		* @class AttributeHeader
		* @brief Header passed in front of every attribute value in AttrInfo signal

ndb/include/ndb_constants.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@
		#define NDB_TYPE_BIGUNSIGNED 10
		#define NDB_TYPE_FLOAT 11
		#define NDB_TYPE_DOUBLE 12
		#define NDB_TYPE_DECIMAL 13 // not used
		#define NDB_TYPE_DECIMAL 13 /* not used */
		#define NDB_TYPE_CHAR 14
		#define NDB_TYPE_VARCHAR 15
		#define NDB_TYPE_BINARY 16

ndb/include/ndb_global.h.in

+2 −4

Original line number	Diff line number	Diff line
		@@ -115,10 +115,8 @@ static const char table_name_separator = '/';
		#endif

		#ifdef __cplusplus
		#include <new>
		#endif

		#ifdef __cplusplus
		inline void* operator new(size_t, void* __p) { return __p; }
		inline void* operator new[](size_t, void* __p) { return __p; }
		extern "C" {
		#endif

ndb/src/kernel/blocks/backup/BackupInit.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		//===========================================================================
		#include "Backup.hpp"

		#include <new>
		#include <Properties.hpp>
		#include <Configuration.hpp>

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@

		#include <EventLogger.hpp>
		#include <TimeQueue.hpp>
		#include <new>

		#include <NdbSleep.h>
		#include <SafeCounter.hpp>