hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated non-source files with new company name.

Browse Source
This commit is contained in:
Markus Makela
2014-10-01 15:21:47 +03:00
parent a5d569ea7e
commit c4ca1ddb13
31 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -115,15 +115,15 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MaxScale")
set(CPACK_PACKAGE_VERSION_MAJOR "${MAXSCALE_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MAJOR "${MAXSCALE_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MAXSCALE_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_MINOR "${MAXSCALE_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MAXSCALE_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION_PATCH "${MAXSCALE_VERSION_PATCH}")
set(CPACK_PACKAGE_CONTACT "SkySQL Ab") set(CPACK_PACKAGE_CONTACT "MariaDB Corporation Ab")
set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}") set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}")
set(CPACK_PACKAGE_NAME "maxscale") set(CPACK_PACKAGE_NAME "maxscale")
set(CPACK_PACKAGE_VENDOR "SkySQL Ab") set(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README) set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig") set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig")
set(CPACK_RPM_PACKAGE_NAME "maxscale") set(CPACK_RPM_PACKAGE_NAME "maxscale")
set(CPACK_RPM_PACKAGE_VENDOR "SkySQL Ab") set(CPACK_RPM_PACKAGE_VENDOR "MariaDB Corporation Ab")
set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/etc /etc/ld.so.conf.d /etc/init.d /etc/rc.d/init.d") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/etc /etc/ld.so.conf.d /etc/init.d /etc/rc.d/init.d")

6
COPYRIGHT
View File

@ -1,4 +1,4 @@
This source code is distributed as part of SkySQL MaxScale. It is free This source code is distributed as part of MariaDB Corporation MaxScale. It is free
software: you can redistribute it and/or modify it under the terms of the software: you can redistribute it and/or modify it under the terms of the
GNU General Public License as published by the Free Software Foundation, GNU General Public License as published by the Free Software Foundation,
version 2. version 2.
@ -12,9 +12,9 @@ You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 51 this program; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Copyright SkySQL Ab 2013 Copyright MariaDB Corporation Ab 2013
SkySQL Corporation Ab MariaDB Corporation Corporation Ab
Tekniikantie 12 Tekniikantie 12
02150 Espoo 02150 Espoo
Finland Finland

4
Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

6
README
View File

@ -1,6 +1,6 @@
/** \mainpage MaxScale by SkySQL /** \mainpage MaxScale by MariaDB Corporation
The SkySQL MaxScale is an intelligent proxy that allows forwarding of The MariaDB Corporation MaxScale is an intelligent proxy that allows forwarding of
database statements to one or more database servers using complex rules, database statements to one or more database servers using complex rules,
a semantic understanding of the database statements and the roles of a semantic understanding of the database statements and the roles of
the various servers within the backend cluster of databases. the various servers within the backend cluster of databases.
@ -28,7 +28,7 @@ issues and communicate with the MaxScale community.
Send email to [maxscale@googlegroups.com](mailto:maxscale@googlegroups.com) Send email to [maxscale@googlegroups.com](mailto:maxscale@googlegroups.com)
or use the [forum](http://groups.google.com/forum/#!forum/maxscale) interface or use the [forum](http://groups.google.com/forum/#!forum/maxscale) interface
Bugs can be reported in the SkySQL bugs database Bugs can be reported in the MariaDB Corporation bugs database
[bug.skysql.com](http://bugs.skysql.com) [bug.skysql.com](http://bugs.skysql.com)
\section Building Building MaxScale \section Building Building MaxScale

2
client/Makefile
View File

@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2014 # Copyright MariaDB Corporation Ab 2014
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

2
debian/control vendored
View File

@ -9,7 +9,7 @@ Package: maxscale
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MaxScale Description: MaxScale
The SkySQL MaxScale is an intelligent proxy that allows forwarding of The MariaDB Corporation MaxScale is an intelligent proxy that allows forwarding of
database statements to one or more database servers using complex rules, database statements to one or more database servers using complex rules,
a semantic understanding of the database statements and the roles of a semantic understanding of the database statements and the roles of
the various servers within the backend cluster of databases. the various servers within the backend cluster of databases.

2
etc/init.d/maxscale
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# maxscale: The SkySQL MaxScale database proxy # maxscale: The MariaDB Corporation MaxScale database proxy
# #
# description: MaxScale provides database specific proxy functionality # description: MaxScale provides database specific proxy functionality
# #

2
etc/init.d/maxscale.in
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# maxscale: The SkySQL MaxScale database proxy # maxscale: The MariaDB Corporation MaxScale database proxy
# #
# description: MaxScale provides database specific proxy functionality # description: MaxScale provides database specific proxy functionality
# #

2
etc/ubuntu/init.d/maxscale
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# maxscale: The SkySQL MaxScale database proxy # maxscale: The MariaDB Corporation MaxScale database proxy
# #
# description: MaxScale provides database specific proxy functionality # description: MaxScale provides database specific proxy functionality
# #

2
etc/ubuntu/init.d/maxscale.in
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# maxscale: The SkySQL MaxScale database proxy # maxscale: The MariaDB Corporation MaxScale database proxy
# #
# description: MaxScale provides database specific proxy functionality # description: MaxScale provides database specific proxy functionality
# #

6
replication_listener/COPYING.SkySQL
View File

@ -1,7 +1,7 @@
Portions of this software contain modifications contributed by SkySQL, Ab. Portions of this software contain modifications contributed by MariaDB Corporation, Ab.
These contributions are used with the following license: These contributions are used with the following license:
Copyright (c) 2013, SkySQL Ab. All rights reserved. Copyright (c) 2013, MariaDB Corporation Ab. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
@ -12,7 +12,7 @@ are met:
copyright notice, this list of conditions and the following copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials disclaimer in the documentation and/or other materials
provided with the distribution. provided with the distribution.
* Neither the name of the SkySQL Ab. nor the names of its * Neither the name of the MariaDB Corporation Ab. nor the names of its
contributors may be used to endorse or promote products contributors may be used to endorse or promote products
derived from this software without specific prior written derived from this software without specific prior written
permission. permission.

2
script/make-binary-tarball.sh
View File

@ -14,7 +14,7 @@ echo "Looking for MaxScale in [${BINARY_PATH}]"
if [ -s "${BINARY_PATH}/bin/maxscale" ]; then if [ -s "${BINARY_PATH}/bin/maxscale" ]; then
if [ -x "${BINARY_PATH}/bin/maxscale" ]; then if [ -x "${BINARY_PATH}/bin/maxscale" ]; then
MAXSCALE_VERSION=`strings ${BINARY_PATH}/bin/maxscale | grep "SkySQL MaxScale" | awk '{print $3}' | head -1` MAXSCALE_VERSION=`strings ${BINARY_PATH}/bin/maxscale | grep "MariaDB Corporation MaxScale" | awk '{print $3}' | head -1`
echo "Found MaxScale, version: ${MAXSCALE_VERSION}" echo "Found MaxScale, version: ${MAXSCALE_VERSION}"
fi fi
else else

4
server/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

4
server/core/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

2
server/core/buffer.c
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* @file buffer.h - The Gateway buffer management functions * @file buffer.h - The MaxScale buffer management functions
* *
* The buffer management is based on the principle of a linked list * The buffer management is based on the principle of a linked list
* of variable size buffer, the intention beign to allow longer * of variable size buffer, the intention beign to allow longer

2
server/core/utils.c
View File

@ -27,7 +27,7 @@
* 10-06-2013 Massimiliano Pinto Initial implementation * 10-06-2013 Massimiliano Pinto Initial implementation
* 12-06-2013 Massimiliano Pinto Read function trought * 12-06-2013 Massimiliano Pinto Read function trought
* the gwbuff strategy * the gwbuff strategy
* 13-06-2013 Massimiliano Pinto Gateway local authentication * 13-06-2013 Massimiliano Pinto MaxScale local authentication
* basics * basics
* *
* @endverbatim * @endverbatim

4
server/include/dcb.h
View File

@ -66,7 +66,7 @@ struct dcb;
* The operations that can be performed on the descriptor * The operations that can be performed on the descriptor
* *
* read EPOLLIN handler for the socket * read EPOLLIN handler for the socket
* write Gateway data write entry point * write MaxScale data write entry point
* write_ready EPOLLOUT handler for the socket, indicates * write_ready EPOLLOUT handler for the socket, indicates
* that the socket is ready to send more data * that the socket is ready to send more data
* error EPOLLERR handler for the socket * error EPOLLERR handler for the socket
@ -74,7 +74,7 @@ struct dcb;
* accept Accept handler for listener socket only * accept Accept handler for listener socket only
* connect Create a connection to the specified server * connect Create a connection to the specified server
* for the session pased in * for the session pased in
* close Gateway close entry point for the socket * close MaxScale close entry point for the socket
* listen Create a listener for the protocol * listen Create a listener for the protocol
* auth Authentication entry point * auth Authentication entry point
* session Session handling entry point * session Session handling entry point

4
server/modules/filter/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of MaxScale form SkySQL. It is free # This file is distributed as part of MaxScale form MariaDB Corporation. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2014 # Copyright MariaDB Corporation Ab 2014
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

4
server/modules/filter/hint/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of MaxScale form SkySQL. It is free # This file is distributed as part of MaxScale form MariaDB Corporation. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2014 # Copyright MariaDB Corporation Ab 2014
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

4
server/modules/monitor/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

4
server/modules/protocol/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

4
server/modules/protocol/httpd.c
View File

@ -49,7 +49,7 @@ MODULE_INFO info = {
}; };
#define ISspace(x) isspace((int)(x)) #define ISspace(x) isspace((int)(x))
#define HTTP_SERVER_STRING "Gateway(c) v.1.0.0" #define HTTP_SERVER_STRING "MaxScale(c) v.1.0.0"
static char *version_str = "V1.0.1"; static char *version_str = "V1.0.1";
static int httpd_read_event(DCB* dcb); static int httpd_read_event(DCB* dcb);
@ -233,7 +233,7 @@ HTTPD_session *client_data = NULL;
* *
*/ */
dcb_printf(dcb, "Welcome to HTTPD Gateway (c) %s\n\n", version_str); dcb_printf(dcb, "Welcome to HTTPD MaxScale (c) %s\n\n", version_str);
if (strcmp(url, "/show") == 0) { if (strcmp(url, "/show") == 0) {
if (strlen(query_string)) { if (strlen(query_string)) {

2
server/modules/protocol/mysql_backend.c
View File

@ -27,7 +27,7 @@
* Revision History * Revision History
* Date Who Description * Date Who Description
* 14/06/2013 Mark Riddoch Initial version * 14/06/2013 Mark Riddoch Initial version
* 17/06/2013 Massimiliano Pinto Added Gateway To Backends routines * 17/06/2013 Massimiliano Pinto Added MaxScale To Backends routines
* 27/06/2013 Vilho Raatikka Added skygw_log_write command as an example * 27/06/2013 Vilho Raatikka Added skygw_log_write command as an example
* and necessary headers. * and necessary headers.
* 01/07/2013 Massimiliano Pinto Put Log Manager example code behind SS_DEBUG macros. * 01/07/2013 Massimiliano Pinto Put Log Manager example code behind SS_DEBUG macros.

4
server/modules/protocol/mysql_client.c
View File

@ -25,7 +25,7 @@
* Revision History * Revision History
* Date Who Description * Date Who Description
* 14/06/2013 Mark Riddoch Initial version * 14/06/2013 Mark Riddoch Initial version
* 17/06/2013 Massimiliano Pinto Added Client To Gateway routines * 17/06/2013 Massimiliano Pinto Added Client To MaxScale routines
* 24/06/2013 Massimiliano Pinto Added: fetch passwords from service users' hashtable * 24/06/2013 Massimiliano Pinto Added: fetch passwords from service users' hashtable
* 02/09/2013 Massimiliano Pinto Added: session refcount * 02/09/2013 Massimiliano Pinto Added: session refcount
* 16/12/2013 Massimiliano Pinto Added: client closed socket detection with recv(..., MSG_PEEK) * 16/12/2013 Massimiliano Pinto Added: client closed socket detection with recv(..., MSG_PEEK)
@ -494,7 +494,7 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
} }
/** /**
* Write function for client DCB: writes data from Gateway to Client * Write function for client DCB: writes data from MaxScale to Client
* *
* @param dcb The DCB of the client * @param dcb The DCB of the client
* @param queue Queue of buffers to write * @param queue Queue of buffers to write

2
server/modules/protocol/mysql_common.c
View File

@ -1313,7 +1313,7 @@ int gw_check_mysql_scramble_data(DCB *dcb, uint8_t *token, unsigned int token_le
/** /**
* gw_find_mysql_user_password_sha1 * gw_find_mysql_user_password_sha1
* *
* The routine fetches look for an user int he Gateway users' table * The routine fetches look for an user int he MaxScale users' table
* The users' table is dcb->service->users or a different one specified with void *repository * The users' table is dcb->service->users or a different one specified with void *repository
* *
* If found the HEX password, representing sha1(sha1(password)), is converted in binary data and * If found the HEX password, representing sha1(sha1(password)), is converted in binary data and

4
server/modules/routing/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

4
server/modules/routing/binlog/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

4
server/modules/routing/readwritesplit/Makefile
View File

@ -1,4 +1,4 @@
# This file is distributed as part of the SkySQL Gateway. It is free # This file is distributed as part of the MariaDB Corporation MaxScale. It is free
# software: you can redistribute it and/or modify it under the terms of the # software: you can redistribute it and/or modify it under the terms of the
# GNU General Public License as published by the Free Software Foundation, # GNU General Public License as published by the Free Software Foundation,
# version 2. # version 2.
@ -12,7 +12,7 @@
# this program; if not, write to the Free Software Foundation, Inc., 51 # this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# Copyright SkySQL Ab 2013 # Copyright MariaDB Corporation Ab 2013
# #
# Revision History # Revision History
# Date Who Description # Date Who Description

2
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -1642,7 +1642,7 @@ void check_create_tmp_table(
* *
* @param instance The query router instance * @param instance The query router instance
* @param session The session associated with the client * @param session The session associated with the client
* @param queue Gateway buffer queue with the packets received * @param queue MaxScale buffer queue with the packets received
* *
* @return if succeed 1, otherwise 0 * @return if succeed 1, otherwise 0
* If routeQuery fails, it means that router session has failed. * If routeQuery fails, it means that router session has failed.

6
table_replication_consistency/CMakeLists.txt
View File

@ -26,10 +26,10 @@ find_path(MySQL_INCLUDE_DIR mysql.h
/usr/local/include/mysql /usr/include/mysql /usr/local/mysql/include) /usr/local/include/mysql /usr/include/mysql /usr/local/mysql/include)
include_directories(${MySQL_INCLUDE_DIR}) include_directories(${MySQL_INCLUDE_DIR})
#SkySQL #MariaDB Corporation
find_path(SkySQL_INCLUDE_DIR skygw_debug.h find_path(MariaDB Corporation_INCLUDE_DIR skygw_debug.h
/usr/local/include /usr/include ../utils) /usr/local/include /usr/include ../utils)
include_directories(${SkySQL_INCLUDE_DIR}) include_directories(${MariaDB Corporation_INCLUDE_DIR})
include_directories(../replication_listener) include_directories(../replication_listener)
#log_manager #log_manager

6
table_replication_consistency/test/CMakeLists.txt
View File

@ -14,10 +14,10 @@ find_path(MySQL_INCLUDE_DIR mysql.h
/usr/local/include/mysql /usr/include/mysql /usr/local/mysql/include) /usr/local/include/mysql /usr/include/mysql /usr/local/mysql/include)
include_directories(${MySQL_INCLUDE_DIR}) include_directories(${MySQL_INCLUDE_DIR})
#SkySQL #MariaDB Corporation
find_path(SkySQL_INCLUDE_DIR skygw_debug.h find_path(MariaDB Corporation_INCLUDE_DIR skygw_debug.h
/usr/local/include /usr/include ../../utils) /usr/local/include /usr/include ../../utils)
include_directories(${SkySQL_INCLUDE_DIR}) include_directories(${MariaDB Corporation_INCLUDE_DIR})
find_path(TRC_INCLUDE_DIR table_replication_consistency.h find_path(TRC_INCLUDE_DIR table_replication_consistency.h
../ /usr/include /usr/local/include) ../ /usr/include /usr/local/include)