build_gateway.inc

Removed MARIADB_SRC_PATH
	Added MYSQL_ROOT - root directory where MariaDB headers are installed
	Added MYSQL_HEADERS - -I notation for three header directories
	Added EMBEDDED_LIB - for embedded library directory
	Added ERRMSG - for errmsg.sys file

log_manager.cc
	Little fixes

log_manager/makefile
	Updated header include directive

makefile.inc
	Removed DEBUGGER and BACKGR as unnecessary
	Added LIB for embedded library file name

query_classifier/makefile
	Updated header include directives and embedded library directory

query_classifier/query_classifier.cc
	clean up

server/core/Makefile
	Updated header include directives and embedded library directory
	Added libaio and install of errmsg.sys

server/core/dcb.c
	clean up

server/core/gateway.c
	Added --language and --skip-innodb to mysql_library_init command-line arguments list
	clean up

server/core/load_utils.c
	clean up

server/modules/monitor/Makefile
server/modules/routing/readwritesplit/Makefile
	Updated header include directives and embedded library directory

utils/skygw_debug.h
	http://bugs.skysql.com/show_bug.cgi?id=369

utils/skygw_types.h
utils/skygw_utils.cc
	clean up
This commit is contained in:
vraatikka
2013-12-06 00:12:41 +02:00
parent 258bcb27da
commit f50de7a084
15 changed files with 110 additions and 107 deletions

View File

@ -38,7 +38,9 @@
#define MAXNBLOCKBUFS 10
/** for procname */
#define _GNU_SOURCE
#if !defined(_GNU_SOURCE)
# define _GNU_SOURCE
#endif
extern char *program_invocation_name;
extern char *program_invocation_short_name;
@ -264,7 +266,7 @@ static void blockbuf_register(blockbuf_t* bb);
static void blockbuf_unregister(blockbuf_t* bb);
static bool logfile_set_enabled(logfile_id_t id, bool val);
static char* add_slash(char* str);
static bool file_exists_and_is_writable(char* filename);
static bool file_exists_and_is_writable(char* filename, bool* writable);
static bool file_is_symlink(char* filename);
@ -609,7 +611,6 @@ static int logmanager_write_log(
blockbuf_t* bb_c;
int timestamp_len;
int i;
bool write_syslog;
CHK_LOGMANAGER(lm);
@ -1612,7 +1613,6 @@ static bool logfiles_init(
int i = 0;
bool store_shmem;
bool write_syslog;
char* syslog_ident;
if (syslog_id_str != NULL)
{

View File

@ -28,7 +28,7 @@ lib: libcomp liblink
libcomp:
$(CPP) -c $(CFLAGS) \
-I$(MARIADB_SRC_PATH)/include/ \
$(MYSQL_HEADERS) \
-I../utils/ -I./ \
-fPIC ./log_manager.cc -o log_manager.o $(LDLIBS)
@ -46,7 +46,7 @@ install: liblink
depend:
@rm -f depend
$(CPP) -M $(CFLAGS) \
-I$(MARIADB_SRC_PATH)/include/ \
$(MYSQL_HEADERS) \
-I../utils/ -I./ \
$(SRCS) > depend