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

Merge mysqldev@bk-internal.mysql.com:/tmp/jonas/save

Browse source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
joreland@mysql.com 2004-08-17 11:57:50 +02:00
commit a2255169d7
9 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ndb/include/ndb_global.h
View file

@ -3,9 +3,11 @@
#define NDBGLOBAL_H #define NDBGLOBAL_H
#include <my_global.h> #include <my_global.h>
#define NDB_BASE_PORT 2200 #define NDB_BASE_PORT 2200
/** signal & SIG_PIPE */
#include <my_alarm.h>
#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
#define NDB_WIN32 #define NDB_WIN32
#else #else

2
ndb/src/cw/cpcd/Process.cpp
View file

@ -15,8 +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 <ndb_global.h> #include <ndb_global.h>
#include <signal.h>
#include <BaseString.hpp> #include <BaseString.hpp>
#include <InputStream.hpp> #include <InputStream.hpp>

1
ndb/src/cw/cpcd/main.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 <ndb_global.h> /* Needed for mkdir(2) */ #include <ndb_global.h> /* Needed for mkdir(2) */
#include <signal.h>
#include "CPCD.hpp" #include "CPCD.hpp"
#include "APIService.hpp" #include "APIService.hpp"

4
ndb/src/kernel/main.cpp
View file

@ -38,10 +38,6 @@
#include <sys/processor.h> // For system informatio #include <sys/processor.h> // For system informatio
#endif #endif
#if !defined NDB_SOFTOSE && !defined NDB_OSE
#include <signal.h> // For process signals
#endif
extern EventLogger g_eventLogger; extern EventLogger g_eventLogger;
void catchsigs(bool ignore); // for process signal handling void catchsigs(bool ignore); // for process signal handling

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

@ -35,8 +35,6 @@
#include <NdbSleep.h> #include <NdbSleep.h>
#include <new> #include <new>
#include <signal.h> // For process signals
extern "C" { extern "C" {
extern void (* ndb_new_handler)(); extern void (* ndb_new_handler)();
} }

2
ndb/src/mgmclient/main.cpp
View file

@ -24,8 +24,6 @@
#include "CommandInterpreter.hpp" #include "CommandInterpreter.hpp"
#include <signal.h>
const char *progname = "ndb_mgm"; const char *progname = "ndb_mgm";

2
ndb/src/mgmsrv/Services.cpp
View file

@ -14,7 +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 <string.h> #include <ndb_global.h>
#include <ctype.h> #include <ctype.h>
#include <uucode.h> #include <uucode.h>

4
ndb/src/ndbapi/NdbOperationInt.cpp
View file

@ -699,8 +699,8 @@ NdbOperation::load_const_u64(Uint32 RegDest, Uint64 Constant)
setErrorCodeAbort(4229); setErrorCodeAbort(4229);
return -1; return -1;
} }
tTemp1 = (Uint32)(Constant & 0xFFFFFFFF); tTemp1 = (Uint32)(Constant >> 32);
tTemp2 = (Uint32)(Constant >> 32); tTemp2 = (Uint32)(Constant & 0xFFFFFFFF);
// 64 bit value // 64 bit value
if (insertATTRINFO( Interpreter::LoadConst64(RegDest)) == -1) if (insertATTRINFO( Interpreter::LoadConst64(RegDest)) == -1)

4
ndb/src/ndbapi/TransporterFacade.cpp
View file

@ -34,10 +34,6 @@
#include <ndb_version.h> #include <ndb_version.h>
#include <SignalLoggerManager.hpp> #include <SignalLoggerManager.hpp>
#if !defined NDB_OSE && !defined NDB_SOFTOSE
#include <signal.h>
#endif
//#define REPORT_TRANSPORTER //#define REPORT_TRANSPORTER
//#define API_TRACE; //#define API_TRACE;