From c4ca1ddb13e351a4a698676eb0732d9183b2fbc6 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 1 Oct 2014 15:21:47 +0300 Subject: [PATCH] Updated non-source files with new company name. --- CMakeLists.txt | 6 +++--- COPYRIGHT | 6 +++--- Makefile | 4 ++-- README | 6 +++--- client/Makefile | 2 +- debian/control | 2 +- etc/init.d/maxscale | 2 +- etc/init.d/maxscale.in | 2 +- etc/ubuntu/init.d/maxscale | 2 +- etc/ubuntu/init.d/maxscale.in | 2 +- replication_listener/COPYING.SkySQL | 6 +++--- script/make-binary-tarball.sh | 2 +- server/Makefile | 4 ++-- server/core/Makefile | 4 ++-- server/core/buffer.c | 2 +- server/core/utils.c | 2 +- server/include/dcb.h | 4 ++-- server/modules/filter/Makefile | 4 ++-- server/modules/filter/hint/Makefile | 4 ++-- server/modules/monitor/Makefile | 4 ++-- server/modules/protocol/Makefile | 4 ++-- server/modules/protocol/httpd.c | 4 ++-- server/modules/protocol/mysql_backend.c | 2 +- server/modules/protocol/mysql_client.c | 4 ++-- server/modules/protocol/mysql_common.c | 2 +- server/modules/routing/Makefile | 4 ++-- server/modules/routing/binlog/Makefile | 4 ++-- server/modules/routing/readwritesplit/Makefile | 4 ++-- server/modules/routing/readwritesplit/readwritesplit.c | 2 +- table_replication_consistency/CMakeLists.txt | 6 +++--- table_replication_consistency/test/CMakeLists.txt | 6 +++--- 31 files changed, 56 insertions(+), 56 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3f7f9571..e83ee7861 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,15 +115,15 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MaxScale") set(CPACK_PACKAGE_VERSION_MAJOR "${MAXSCALE_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${MAXSCALE_VERSION_MINOR}") 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_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_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig") 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_AUTOREQPROV " no") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/etc /etc/ld.so.conf.d /etc/init.d /etc/rc.d/init.d") diff --git a/COPYRIGHT b/COPYRIGHT index 47d6ca846..83c3e4f14 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -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 GNU General Public License as published by the Free Software Foundation, 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 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 02150 Espoo Finland diff --git a/Makefile b/Makefile index fe49583b0..aee79e163 100644 --- a/Makefile +++ b/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/README b/README index 69ecea0bb..eeb103c1d 100644 --- a/README +++ b/README @@ -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, a semantic understanding of the database statements and the roles of 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) 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) \section Building Building MaxScale diff --git a/client/Makefile b/client/Makefile index 22220db2d..e97cc878b 100644 --- a/client/Makefile +++ b/client/Makefile @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2014 +# Copyright MariaDB Corporation Ab 2014 # # Revision History # Date Who Description diff --git a/debian/control b/debian/control index be0a062ec..cb85e28ea 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Package: maxscale Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} 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, a semantic understanding of the database statements and the roles of the various servers within the backend cluster of databases. diff --git a/etc/init.d/maxscale b/etc/init.d/maxscale index dde616fb3..40f368326 100755 --- a/etc/init.d/maxscale +++ b/etc/init.d/maxscale @@ -1,6 +1,6 @@ #!/bin/sh # -# maxscale: The SkySQL MaxScale database proxy +# maxscale: The MariaDB Corporation MaxScale database proxy # # description: MaxScale provides database specific proxy functionality # diff --git a/etc/init.d/maxscale.in b/etc/init.d/maxscale.in index bf96d6f32..00c9777aa 100755 --- a/etc/init.d/maxscale.in +++ b/etc/init.d/maxscale.in @@ -1,6 +1,6 @@ #!/bin/sh # -# maxscale: The SkySQL MaxScale database proxy +# maxscale: The MariaDB Corporation MaxScale database proxy # # description: MaxScale provides database specific proxy functionality # diff --git a/etc/ubuntu/init.d/maxscale b/etc/ubuntu/init.d/maxscale index c81ffb475..82bc05632 100755 --- a/etc/ubuntu/init.d/maxscale +++ b/etc/ubuntu/init.d/maxscale @@ -1,6 +1,6 @@ #!/bin/sh # -# maxscale: The SkySQL MaxScale database proxy +# maxscale: The MariaDB Corporation MaxScale database proxy # # description: MaxScale provides database specific proxy functionality # diff --git a/etc/ubuntu/init.d/maxscale.in b/etc/ubuntu/init.d/maxscale.in index 600e8f5f8..3610b8fd9 100644 --- a/etc/ubuntu/init.d/maxscale.in +++ b/etc/ubuntu/init.d/maxscale.in @@ -1,6 +1,6 @@ #!/bin/sh # -# maxscale: The SkySQL MaxScale database proxy +# maxscale: The MariaDB Corporation MaxScale database proxy # # description: MaxScale provides database specific proxy functionality # diff --git a/replication_listener/COPYING.SkySQL b/replication_listener/COPYING.SkySQL index 9845b0fe8..52951686d 100644 --- a/replication_listener/COPYING.SkySQL +++ b/replication_listener/COPYING.SkySQL @@ -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: -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 modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ are met: copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials 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 derived from this software without specific prior written permission. diff --git a/script/make-binary-tarball.sh b/script/make-binary-tarball.sh index 416a10675..531306ddb 100755 --- a/script/make-binary-tarball.sh +++ b/script/make-binary-tarball.sh @@ -14,7 +14,7 @@ echo "Looking for MaxScale in [${BINARY_PATH}]" if [ -s "${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}" fi else diff --git a/server/Makefile b/server/Makefile index fda9d14c1..93a181a07 100644 --- a/server/Makefile +++ b/server/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/server/core/Makefile b/server/core/Makefile index 7ad4e1b01..a5db8d9fe 100644 --- a/server/core/Makefile +++ b/server/core/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/server/core/buffer.c b/server/core/buffer.c index 5dc3b0ec7..279d793b8 100644 --- a/server/core/buffer.c +++ b/server/core/buffer.c @@ -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 * of variable size buffer, the intention beign to allow longer diff --git a/server/core/utils.c b/server/core/utils.c index 50ce5cd7d..364d97bc6 100644 --- a/server/core/utils.c +++ b/server/core/utils.c @@ -27,7 +27,7 @@ * 10-06-2013 Massimiliano Pinto Initial implementation * 12-06-2013 Massimiliano Pinto Read function trought * the gwbuff strategy - * 13-06-2013 Massimiliano Pinto Gateway local authentication + * 13-06-2013 Massimiliano Pinto MaxScale local authentication * basics * * @endverbatim diff --git a/server/include/dcb.h b/server/include/dcb.h index 3d0e96762..c455fcbb8 100644 --- a/server/include/dcb.h +++ b/server/include/dcb.h @@ -66,7 +66,7 @@ struct dcb; * The operations that can be performed on the descriptor * * 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 * that the socket is ready to send more data * error EPOLLERR handler for the socket @@ -74,7 +74,7 @@ struct dcb; * accept Accept handler for listener socket only * connect Create a connection to the specified server * 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 * auth Authentication entry point * session Session handling entry point diff --git a/server/modules/filter/Makefile b/server/modules/filter/Makefile index c52c8a8fa..284c7b2dc 100644 --- a/server/modules/filter/Makefile +++ b/server/modules/filter/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2014 +# Copyright MariaDB Corporation Ab 2014 # # Revision History # Date Who Description diff --git a/server/modules/filter/hint/Makefile b/server/modules/filter/hint/Makefile index 4f2194739..202034b9c 100644 --- a/server/modules/filter/hint/Makefile +++ b/server/modules/filter/hint/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2014 +# Copyright MariaDB Corporation Ab 2014 # # Revision History # Date Who Description diff --git a/server/modules/monitor/Makefile b/server/modules/monitor/Makefile index 0f3bc5867..f178536d8 100644 --- a/server/modules/monitor/Makefile +++ b/server/modules/monitor/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/server/modules/protocol/Makefile b/server/modules/protocol/Makefile index 0b41d329e..8f6201e3e 100644 --- a/server/modules/protocol/Makefile +++ b/server/modules/protocol/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/server/modules/protocol/httpd.c b/server/modules/protocol/httpd.c index 5d37ae187..9729fb99d 100644 --- a/server/modules/protocol/httpd.c +++ b/server/modules/protocol/httpd.c @@ -49,7 +49,7 @@ MODULE_INFO info = { }; #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 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 (strlen(query_string)) { diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c index 12643d953..da1f73f4f 100644 --- a/server/modules/protocol/mysql_backend.c +++ b/server/modules/protocol/mysql_backend.c @@ -27,7 +27,7 @@ * Revision History * Date Who Description * 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 * and necessary headers. * 01/07/2013 Massimiliano Pinto Put Log Manager example code behind SS_DEBUG macros. diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c index 445996196..b1559b94b 100644 --- a/server/modules/protocol/mysql_client.c +++ b/server/modules/protocol/mysql_client.c @@ -25,7 +25,7 @@ * Revision History * Date Who Description * 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 * 02/09/2013 Massimiliano Pinto Added: session refcount * 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 queue Queue of buffers to write diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c index af04209e2..17a04a77b 100644 --- a/server/modules/protocol/mysql_common.c +++ b/server/modules/protocol/mysql_common.c @@ -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 * - * 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 * * If found the HEX password, representing sha1(sha1(password)), is converted in binary data and diff --git a/server/modules/routing/Makefile b/server/modules/routing/Makefile index d27430112..5219635d3 100644 --- a/server/modules/routing/Makefile +++ b/server/modules/routing/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/server/modules/routing/binlog/Makefile b/server/modules/routing/binlog/Makefile index 6e9282ea1..991e86ccd 100644 --- a/server/modules/routing/binlog/Makefile +++ b/server/modules/routing/binlog/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/server/modules/routing/readwritesplit/Makefile b/server/modules/routing/readwritesplit/Makefile index 80f2ec572..134a7271c 100644 --- a/server/modules/routing/readwritesplit/Makefile +++ b/server/modules/routing/readwritesplit/Makefile @@ -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 # GNU General Public License as published by the Free Software Foundation, # version 2. @@ -12,7 +12,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Copyright SkySQL Ab 2013 +# Copyright MariaDB Corporation Ab 2013 # # Revision History # Date Who Description diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c index 0ad46b0e4..a8ae23940 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.c +++ b/server/modules/routing/readwritesplit/readwritesplit.c @@ -1642,7 +1642,7 @@ void check_create_tmp_table( * * @param instance The query router instance * @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 * If routeQuery fails, it means that router session has failed. diff --git a/table_replication_consistency/CMakeLists.txt b/table_replication_consistency/CMakeLists.txt index 11bd90c03..360471161 100644 --- a/table_replication_consistency/CMakeLists.txt +++ b/table_replication_consistency/CMakeLists.txt @@ -26,10 +26,10 @@ find_path(MySQL_INCLUDE_DIR mysql.h /usr/local/include/mysql /usr/include/mysql /usr/local/mysql/include) include_directories(${MySQL_INCLUDE_DIR}) -#SkySQL -find_path(SkySQL_INCLUDE_DIR skygw_debug.h +#MariaDB Corporation +find_path(MariaDB Corporation_INCLUDE_DIR skygw_debug.h /usr/local/include /usr/include ../utils) -include_directories(${SkySQL_INCLUDE_DIR}) +include_directories(${MariaDB Corporation_INCLUDE_DIR}) include_directories(../replication_listener) #log_manager diff --git a/table_replication_consistency/test/CMakeLists.txt b/table_replication_consistency/test/CMakeLists.txt index f2b461f8d..5f977310c 100644 --- a/table_replication_consistency/test/CMakeLists.txt +++ b/table_replication_consistency/test/CMakeLists.txt @@ -14,10 +14,10 @@ find_path(MySQL_INCLUDE_DIR mysql.h /usr/local/include/mysql /usr/include/mysql /usr/local/mysql/include) include_directories(${MySQL_INCLUDE_DIR}) -#SkySQL -find_path(SkySQL_INCLUDE_DIR skygw_debug.h +#MariaDB Corporation +find_path(MariaDB Corporation_INCLUDE_DIR skygw_debug.h /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 ../ /usr/include /usr/local/include)