From 0acb8fe05d9f03e873723f43be2de0e8f126dad4 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 1 Oct 2014 13:48:00 +0300 Subject: [PATCH] Renaming missed SkySQL references. --- replication_listener/access_method_factory.h | 2 +- replication_listener/basic_content_handler.h | 4 ++-- replication_listener/binlog_api.h | 4 ++-- replication_listener/binlog_driver.h | 4 ++-- replication_listener/binlog_event.h | 4 ++-- replication_listener/tcp_driver.h | 4 ++-- server/core/filter.c | 2 +- server/core/gateway.c | 4 ++-- server/core/modutil.c | 2 +- server/include/modutil.h | 2 +- server/modules/filter/hint/hintfilter.c | 2 +- server/modules/filter/hint/hintparser.c | 2 +- server/modules/filter/mqfilter.c | 2 +- server/modules/filter/qlafilter.c | 2 +- server/modules/filter/regexfilter.c | 2 +- server/modules/filter/tee.c | 2 +- server/modules/filter/testfilter.c | 2 +- server/modules/filter/topfilter.c | 2 +- server/modules/routing/GaleraHACRoute.c | 2 +- server/modules/routing/debugcli.c | 2 +- utils/skygw_utils.cc | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/replication_listener/access_method_factory.h b/replication_listener/access_method_factory.h index 2a3b6d73e..670129159 100644 --- a/replication_listener/access_method_factory.h +++ b/replication_listener/access_method_factory.h @@ -4,7 +4,7 @@ reserved. Copyright (c) 2013, MariaDB Corporation Ab Portions of this file contain modifications contributed and copyrighted by -SkySQL, Ab. Those modifications are gratefully acknowledged and are described +MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described briefly in the source code. This program is free software; you can redistribute it and/or diff --git a/replication_listener/basic_content_handler.h b/replication_listener/basic_content_handler.h index 55a52d8b2..6966f4887 100644 --- a/replication_listener/basic_content_handler.h +++ b/replication_listener/basic_content_handler.h @@ -4,7 +4,7 @@ reserved. Copyright (c) 2013, MariaDB Corporation Ab Portions of this file contain modifications contributed and copyrighted by -SkySQL, Ab. Those modifications are gratefully acknowledged and are described +MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described briefly in the source code. This program is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* -SkySQL change details: +MariaDB Corporation change details: - Added GTID event handler Author: Jan Lindström (jan.lindstrom@skysql.com diff --git a/replication_listener/binlog_api.h b/replication_listener/binlog_api.h index 4920bec30..22ad60180 100644 --- a/replication_listener/binlog_api.h +++ b/replication_listener/binlog_api.h @@ -4,7 +4,7 @@ reserved. Copyright (c) 2013, MariaDB Corporation Ab Portions of this file contain modifications contributed and copyrighted by -SkySQL, Ab. Those modifications are gratefully acknowledged and are described +MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described briefly in the source code. This program is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* -SkySQL change details: +MariaDB Corporation change details: - Added support for setting binlog position based on GTID - Added support for MySQL and MariDB server types diff --git a/replication_listener/binlog_driver.h b/replication_listener/binlog_driver.h index 9d0cbb4cb..f04d12cf5 100644 --- a/replication_listener/binlog_driver.h +++ b/replication_listener/binlog_driver.h @@ -4,7 +4,7 @@ reserved. Copyright (c) 2013, MariaDB Corporation Ab Portions of this file contain modifications contributed and copyrighted by -SkySQL, Ab. Those modifications are gratefully acknowledged and are described +MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described briefly in the source code. This program is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* -SkySQL change details: +MariaDB Corporation change details: - Added support for GTID event handling for both MySQL and MariaDB - Added support for setting binlog position based on GTID diff --git a/replication_listener/binlog_event.h b/replication_listener/binlog_event.h index 74022287e..e4afbad58 100644 --- a/replication_listener/binlog_event.h +++ b/replication_listener/binlog_event.h @@ -4,7 +4,7 @@ reserved. Copyright (c) 2013, MariaDB Corporation Ab Portions of this file contain modifications contributed and copyrighted by -SkySQL, Ab. Those modifications are gratefully acknowledged and are described +MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described briefly in the source code. This program is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* -SkySQL change details: +MariaDB Corporation change details: - Added support for GTID event handling for both MySQL and MariaDB Author: Jan Lindström (jan.lindstrom@skysql.com diff --git a/replication_listener/tcp_driver.h b/replication_listener/tcp_driver.h index 035173608..64d27342c 100644 --- a/replication_listener/tcp_driver.h +++ b/replication_listener/tcp_driver.h @@ -4,7 +4,7 @@ reserved. Copyright (c) 2013, MariaDB Corporation Ab Portions of this file contain modifications contributed and copyrighted by -SkySQL, Ab. Those modifications are gratefully acknowledged and are described +MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described briefly in the source code. This program is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* -SkySQL change details: +MariaDB Corporation change details: - Added support for GTID event handling for both MySQL and MariaDB - Added support for starting binlog dump from GTID position - Added support for MariaDB server diff --git a/server/core/filter.c b/server/core/filter.c index fef852d40..a1f210354 100644 --- a/server/core/filter.c +++ b/server/core/filter.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale from SkySQL. It is free + * This file is distributed as part of MaxScale from 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. diff --git a/server/core/gateway.c b/server/core/gateway.c index 2b70d66c2..6c06ae9b5 100644 --- a/server/core/gateway.c +++ b/server/core/gateway.c @@ -387,7 +387,7 @@ static bool file_write_header( *t = time(NULL); *tm = *localtime(t); - header_buf1 = "\n\nSkySQL MaxScale " MAXSCALE_VERSION "\t"; + header_buf1 = "\n\nMariaDB Corporation MaxScale " MAXSCALE_VERSION "\t"; header_buf2 = strdup(asctime(tm)); if (header_buf2 == NULL) { @@ -1539,7 +1539,7 @@ int main(int argc, char **argv) } LOGIF(LM, (skygw_log_write( LOGFILE_MESSAGE, - "SkySQL MaxScale %s (C) MariaDB Corporation Ab 2013,2014", + "MariaDB Corporation MaxScale %s (C) MariaDB Corporation Ab 2013,2014", MAXSCALE_VERSION))); LOGIF(LM, (skygw_log_write( LOGFILE_MESSAGE, diff --git a/server/core/modutil.c b/server/core/modutil.c index b0d846abb..cb4ed0a28 100644 --- a/server/core/modutil.c +++ b/server/core/modutil.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale from SkySQL. It is free + * This file is distributed as part of MaxScale from 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. diff --git a/server/include/modutil.h b/server/include/modutil.h index 593e1cc61..3935e8e80 100644 --- a/server/include/modutil.h +++ b/server/include/modutil.h @@ -1,7 +1,7 @@ #ifndef _MODUTIL_H #define _MODUTIL_H /* - * This file is distributed as part of MaxScale from SkySQL. It is free + * This file is distributed as part of MaxScale from 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. diff --git a/server/modules/filter/hint/hintfilter.c b/server/modules/filter/hint/hintfilter.c index 73a392703..67c9f7f28 100644 --- a/server/modules/filter/hint/hintfilter.c +++ b/server/modules/filter/hint/hintfilter.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/filter/hint/hintparser.c b/server/modules/filter/hint/hintparser.c index ac487fd11..a70e42fe2 100644 --- a/server/modules/filter/hint/hintparser.c +++ b/server/modules/filter/hint/hintparser.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/filter/mqfilter.c b/server/modules/filter/mqfilter.c index f56425937..e6a6c12b1 100644 --- a/server/modules/filter/mqfilter.c +++ b/server/modules/filter/mqfilter.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/filter/qlafilter.c b/server/modules/filter/qlafilter.c index d44660eae..1367b685b 100644 --- a/server/modules/filter/qlafilter.c +++ b/server/modules/filter/qlafilter.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/filter/regexfilter.c b/server/modules/filter/regexfilter.c index f5d579a4a..fd2bbbf8a 100644 --- a/server/modules/filter/regexfilter.c +++ b/server/modules/filter/regexfilter.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/filter/tee.c b/server/modules/filter/tee.c index 0694d80ee..e87e95f95 100644 --- a/server/modules/filter/tee.c +++ b/server/modules/filter/tee.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/filter/testfilter.c b/server/modules/filter/testfilter.c index 31d8872b1..8f0c0f573 100644 --- a/server/modules/filter/testfilter.c +++ b/server/modules/filter/testfilter.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/filter/topfilter.c b/server/modules/filter/topfilter.c index d7ee07875..4673cd2b8 100644 --- a/server/modules/filter/topfilter.c +++ b/server/modules/filter/topfilter.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of MaxScale by SkySQL. It is free + * This file is distributed as part of MaxScale by 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. diff --git a/server/modules/routing/GaleraHACRoute.c b/server/modules/routing/GaleraHACRoute.c index 2c0773f2b..dca0c302b 100644 --- a/server/modules/routing/GaleraHACRoute.c +++ b/server/modules/routing/GaleraHACRoute.c @@ -1,5 +1,5 @@ /* - * This file is distributed as part of SkySQL MaxScale. It is free + * This file 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. diff --git a/server/modules/routing/debugcli.c b/server/modules/routing/debugcli.c index 66f5d8f1f..ef6faf4dc 100644 --- a/server/modules/routing/debugcli.c +++ b/server/modules/routing/debugcli.c @@ -210,7 +210,7 @@ CLI_SESSION *client; session->state = SESSION_STATE_READY; client->mode = inst->mode; - dcb_printf(session->client, "Welcome the SkySQL MaxScale Debug Interface (%s).\n", + dcb_printf(session->client, "Welcome the MariaDB Corporation MaxScale Debug Interface (%s).\n", version_str); if (client->mode == CLIM_DEVELOPER) { diff --git a/utils/skygw_utils.cc b/utils/skygw_utils.cc index 30b7ae8a9..a5776e47f 100644 --- a/utils/skygw_utils.cc +++ b/utils/skygw_utils.cc @@ -1600,7 +1600,7 @@ static bool file_write_header( *tm = *localtime(t); CHK_FILE(file); - header_buf1 = "\n\nSkySQL MaxScale\t"; + header_buf1 = "\n\nMariaDB Corporation MaxScale\t"; header_buf2 = (char *)calloc(1, strlen(file->sf_fname)+2); snprintf(header_buf2, strlen(file->sf_fname)+2, "%s ", file->sf_fname); header_buf3 = strdup(asctime(tm));