mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
a2e4768f20
changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
added define NDB_INIT
removed getarg, strlcat, strlcpy
aligned ndb version with mysql version
cpcd: removed old way of reading config file and replaced with mysql load_defaults
changed from using getarg to my_getopts
use mysql my_progname
moved getarg to test
BitKeeper/deleted/.del-strlcat.c~250851f8f1ac1c2c:
Delete: ndb/src/common/util/strlcat.c
BitKeeper/deleted/.del-strlcpy.c~43266e312d11c47b:
Delete: ndb/src/common/util/strlcpy.c
ndb/test/include/getarg.h:
Rename: ndb/include/util/getarg.h -> ndb/test/include/getarg.h
configure.in:
aligned ndb versioning with mysql
changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/include/ndb_global.h:
added define NDB_INIT
removed strlcpy, strlcat
ndb/src/common/editline/sysunix.c:
removed usage of strlcat
ndb/src/common/util/Makefile.am:
removed getarg, strlcat, strlcpy
ndb/src/common/util/basestring_vsnprintf.c:
changed define from SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/src/common/util/socket_io.cpp:
removed usage of strlcat
ndb/src/common/util/version.c:
aligned ndb version with mysql version
ndb/src/cw/cpcd/common.cpp:
removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/common.hpp:
removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/main.cpp:
changed from usin getarg to my_opts
ndb/src/kernel/blocks/backup/restore/main.cpp:
changed from usin getarg to my_opts
ndb/src/kernel/error/ErrorReporter.cpp:
use mysql my_progname
ndb/src/kernel/main.cpp:
removed const in main declaration
ndb/src/kernel/vm/Configuration.cpp:
changed from usin getarg to my_opts
ndb/src/kernel/vm/Configuration.hpp:
removed const in main declaration
ndb/src/mgmclient/main.cpp:
changed from usin getarg to my_opts
ndb/src/mgmsrv/main.cpp:
changed from usin getarg to my_opts
ndb/src/ndbapi/Ndb.cpp:
fixed compiler warnings
ndb/test/run-test/Makefile.am:
moved getarg to test
ndb/test/src/Makefile.am:
moved getarg to test
ndb/test/src/getarg.c:
moved strlcat and strlcpy into getarg.c
ndb/tools/delete_all.cpp:
changed from usin getarg to my_opts
ndb/tools/desc.cpp:
changed from usin getarg to my_opts
ndb/tools/drop_index.cpp:
changed from usin getarg to my_opts
ndb/tools/drop_tab.cpp:
changed from usin getarg to my_opts
ndb/tools/listTables.cpp:
changed from usin getarg to my_opts
ndb/tools/select_all.cpp:
changed from usin getarg to my_opts
ndb/tools/select_count.cpp:
changed from usin getarg to my_opts
ndb/tools/waiter.cpp:
changed from usin getarg to my_opts
108 lines
1.8 KiB
C
108 lines
1.8 KiB
C
|
|
#ifndef NDBGLOBAL_H
|
|
#define NDBGLOBAL_H
|
|
|
|
#include <my_global.h>
|
|
|
|
/** signal & SIG_PIPE */
|
|
#include <my_alarm.h>
|
|
|
|
#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
|
|
#define NDB_WIN32
|
|
#else
|
|
#undef NDB_WIN32
|
|
#endif
|
|
|
|
#ifdef _AIX
|
|
#undef _H_STRINGS
|
|
#endif
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include <ndb_types.h>
|
|
#include <ctype.h>
|
|
#ifdef HAVE_STDARG_H
|
|
#include <stdarg.h>
|
|
#endif
|
|
#ifdef TIME_WITH_SYS_TIME
|
|
#include <time.h>
|
|
#endif
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
#include <sys/param.h>
|
|
#ifdef HAVE_SYS_STAT_H
|
|
#if defined(__cplusplus) && defined(_APP32_64BIT_OFF_T) && defined(_INCLUDE_AES_SOURCE)
|
|
#undef _INCLUDE_AES_SOURCE
|
|
#include <sys/stat.h>
|
|
#define _INCLUDE_AES_SOURCE
|
|
#else
|
|
#include <sys/stat.h>
|
|
#endif
|
|
#endif
|
|
#include <sys/resource.h>
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
#include <sys/wait.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_MMAN_H
|
|
#include <sys/mman.h>
|
|
#endif
|
|
|
|
#ifdef NDB_WIN32
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
|
|
#define DIR_SEPARATOR "\\"
|
|
#define PATH_MAX 256
|
|
|
|
#pragma warning(disable: 4503 4786)
|
|
#else
|
|
|
|
#define DIR_SEPARATOR "/"
|
|
|
|
#endif
|
|
|
|
static const char table_name_separator = '/';
|
|
|
|
#if defined(_AIX) || defined(NDB_VC98)
|
|
#define STATIC_CONST(x) enum { x }
|
|
#else
|
|
#define STATIC_CONST(x) static const Uint32 x
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
#include <new>
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#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();}
|
|
|
|
#ifndef HAVE_STRDUP
|
|
extern char * strdup(const char *s);
|
|
#endif
|
|
|
|
#ifndef HAVE_STRCASECMP
|
|
extern int strcasecmp(const char *s1, const char *s2);
|
|
extern int strncasecmp(const char *s1, const char *s2, size_t n);
|
|
#endif
|
|
|
|
#ifdef SCO
|
|
|
|
#ifndef PATH_MAX
|
|
#define PATH_MAX 1024
|
|
#endif
|
|
|
|
#endif /* SCO */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|