mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown 2005-01-19 10:07:18 +01:00
commit 69d7cf6756
15 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ndb/include/kernel/AttributeHeader.hpp
View file

@ -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

2
ndb/include/ndb_constants.h
View file

@ -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

6
ndb/include/ndb_global.h.in
View file

@ -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

1
ndb/src/kernel/blocks/backup/BackupInit.cpp
View file

@ -22,7 +22,6 @@
//===========================================================================
#include "Backup.hpp"
#include <new>
#include <Properties.hpp>
#include <Configuration.hpp>

1
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
View file

@ -39,7 +39,6 @@
#include <EventLogger.hpp>
#include <TimeQueue.hpp>
#include <new>
#include <NdbSleep.h>
#include <SafeCounter.hpp>

1
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
View file

@ -18,7 +18,6 @@
#define DBDIH_C
#include "Dbdih.hpp"
#include <ndb_limits.h>
#include <new>
#define DEBUG(x) { ndbout << "DIH::" << x << endl; }

1
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
View file

@ -19,7 +19,6 @@
#define DBLQH_C
#include "Dblqh.hpp"
#include <ndb_limits.h>
#include <new>
#define DEBUG(x) { ndbout << "LQH::" << x << endl; }

1
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
View file

@ -20,7 +20,6 @@
#include <ndb_limits.h>
#include <Properties.hpp>
#include <Configuration.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TC::" << x << endl; }

1
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
View file

@ -31,7 +31,6 @@
#include <signaldata/TupKey.hpp>
#include <signaldata/DropTab.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TUP::" << x << endl; }

1
ndb/src/kernel/blocks/dbtux/Dbtux.hpp
View file

@ -17,7 +17,6 @@
#ifndef DBTUX_H
#define DBTUX_H
#include <new>
#include <ndb_limits.h>
#include <SimulatedBlock.hpp>
#include <AttributeDescriptor.hpp>

1
ndb/src/kernel/blocks/grep/GrepInit.cpp
View file

@ -15,7 +15,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "Grep.hpp"
#include <new>
#include <Properties.hpp>
#include <Configuration.hpp>

1
ndb/src/kernel/blocks/suma/SumaInit.cpp
View file

@ -16,7 +16,6 @@
#include "Suma.hpp"
#include <new>
#include <Properties.hpp>
#include <Configuration.hpp>

1
ndb/src/kernel/vm/Emulator.cpp
View file

@ -33,7 +33,6 @@
#include <NdbOut.hpp>
#include <NdbMutex.h>
#include <NdbSleep.h>
#include <new>
extern "C" {
extern void (* ndb_new_handler)();

1
ndb/src/kernel/vm/SimulatedBlock.hpp
View file

@ -36,7 +36,6 @@
#include <ErrorReporter.hpp>
#include <ErrorHandlingMacros.hpp>
#include <new>
#include "DLList.hpp"
#include "ArrayPool.hpp"
#include "DLHashTable.hpp"

1
ndb/src/mgmapi/mgmapi_configuration.cpp
View file

@ -1,7 +1,6 @@
#include <ndb_types.h>
#include <mgmapi.h>
#include "mgmapi_configuration.hpp"
#include <new>
ndb_mgm_configuration_iterator::ndb_mgm_configuration_iterator
(const ndb_mgm_configuration & conf, unsigned type_of_section)