database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

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


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown
2005-01-19 10:07:14 +01:00
parent bfe74e6990 7893b8dfaa
commit 21d24f34a6
16 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/mysql-test-run.sh
View File

@@ -241,6 +241,9 @@ USE_EMBEDDED_SERVER=""
RESULT_EXT="" RESULT_EXT=""
TEST_MODE="default" TEST_MODE="default"
NDB_MGMD_EXTRA_OPTS=
NDBD_EXTRA_OPTS=
while test $# -gt 0; do while test $# -gt 0; do
case "$1" in case "$1" in
--embedded-server) USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 ; \ --embedded-server) USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 ; \
@@ -261,6 +264,10 @@ while test $# -gt 0; do
--ndb-connectstring=*) --ndb-connectstring=*)
USE_NDBCLUSTER="--ndbcluster" ; USE_NDBCLUSTER="--ndbcluster" ;
USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;; USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;;
--ndb_mgmd-extra-opts=*)
NDB_MGMD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgmd-extra-opts=;;"` ;;
--ndbd-extra-opts=*)
NDBD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndbd-extra-opts=;;"` ;;
--tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
--local-master) --local-master)
MASTER_MYPORT=3306; MASTER_MYPORT=3306;
@@ -463,7 +470,7 @@ SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"
export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1 export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
NDBCLUSTER_BASE_PORT=`expr $NDBCLUSTER_PORT + 2` NDBCLUSTER_BASE_PORT=`expr $NDBCLUSTER_PORT + 2`
NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var" NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgmd-extra-opts=\"$NDB_MGMD_EXTRA_OPTS\" --ndbd-extra-opts=\"$NDBD_EXTRA_OPTS\""
if [ x$SOURCE_DIST = x1 ] ; then if [ x$SOURCE_DIST = x1 ] ; then
MY_BASEDIR=$MYSQL_TEST_DIR MY_BASEDIR=$MYSQL_TEST_DIR

13
mysql-test/ndb/ndbcluster.sh
View File

@@ -58,6 +58,9 @@ ndb_con_op=105000
ndb_dmem=80M ndb_dmem=80M
ndb_imem=24M ndb_imem=24M
NDB_MGMD_EXTRA_OPTS=
NDBD_EXTRA_OPTS=
while test $# -gt 0; do while test $# -gt 0; do
case "$1" in case "$1" in
--test) --test)
@@ -94,6 +97,12 @@ while test $# -gt 0; do
--port-base=*) --port-base=*)
port_base=`echo "$1" | sed -e "s;--port-base=;;"` port_base=`echo "$1" | sed -e "s;--port-base=;;"`
;; ;;
--ndb_mgmd-extra-opts=*)
NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"`
;;
--ndbd-extra-opts=*)
NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`
;;
-- ) shift; break ;; -- ) shift; break ;;
--* ) $ECHO "Unrecognized option: $1"; exit 1 ;; --* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
* ) break ;; * ) break ;;
@@ -122,8 +131,8 @@ if [ ! -x "$exec_waiter" ]; then
fi fi
exec_mgmtclient="$exec_mgmtclient --no-defaults" exec_mgmtclient="$exec_mgmtclient --no-defaults"
exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults" exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS"
exec_ndb="$exec_ndb --no-defaults" exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS"
exec_waiter="$exec_waiter --no-defaults" exec_waiter="$exec_waiter --no-defaults"
ndb_host="localhost" ndb_host="localhost"

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

@@ -17,7 +17,6 @@
#ifndef ATTRIBUTE_HEADER #ifndef ATTRIBUTE_HEADER
#define ATTRIBUTE_HEADER #define ATTRIBUTE_HEADER
#include <new>
/** /**
* @class AttributeHeader * @class AttributeHeader
* @brief Header passed in front of every attribute value in AttrInfo signal * @brief Header passed in front of every attribute value in AttrInfo signal

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

@@ -115,10 +115,8 @@ static const char table_name_separator = '/';
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
#include <new> inline void* operator new(size_t, void* __p) { return __p; }
#endif inline void* operator new[](size_t, void* __p) { return __p; }
#ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

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

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

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

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

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

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

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

@@ -19,7 +19,6 @@
#define DBLQH_C #define DBLQH_C
#include "Dblqh.hpp" #include "Dblqh.hpp"
#include <ndb_limits.h> #include <ndb_limits.h>
#include <new>
#define DEBUG(x) { ndbout << "LQH::" << x << endl; } #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 <ndb_limits.h>
#include <Properties.hpp> #include <Properties.hpp>
#include <Configuration.hpp> #include <Configuration.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TC::" << x << endl; } #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/TupKey.hpp>
#include <signaldata/DropTab.hpp> #include <signaldata/DropTab.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TUP::" << x << endl; } #define DEBUG(x) { ndbout << "TUP::" << x << endl; }

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

@@ -17,7 +17,6 @@
#ifndef DBTUX_H #ifndef DBTUX_H
#define DBTUX_H #define DBTUX_H
#include <new>
#include <ndb_limits.h> #include <ndb_limits.h>
#include <SimulatedBlock.hpp> #include <SimulatedBlock.hpp>
#include <AttributeDescriptor.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 */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "Grep.hpp" #include "Grep.hpp"
#include <new>
#include <Properties.hpp> #include <Properties.hpp>
#include <Configuration.hpp> #include <Configuration.hpp>

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

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

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

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

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

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

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

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