From 5fa7e4bf71c17bf4fc19d35cf4b249f3d32cd055 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 1 Oct 2014 15:08:24 +0300 Subject: [PATCH] Updated replication_listener and table_replication_consistency with up-to-date licensing information. --- replication_listener/access_method_factory.cpp | 6 +++--- replication_listener/basic_content_handler.cpp | 6 +++--- replication_listener/binary_log.cpp | 6 +++--- replication_listener/binlog_driver.cpp | 6 +++--- replication_listener/binlog_event.cpp | 6 +++--- replication_listener/gtid.cpp | 4 ++-- replication_listener/protocol.cpp | 6 +++--- replication_listener/tcp_driver.cpp | 6 +++--- replication_listener/tests/event_dump.cpp | 4 ++-- .../table_replication_consistency.cpp | 8 ++++---- .../table_replication_consistency.h | 4 ++-- .../table_replication_listener.cpp | 4 ++-- .../table_replication_metadata.cpp | 4 ++-- .../table_replication_parser.cpp | 4 ++-- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/replication_listener/access_method_factory.cpp b/replication_listener/access_method_factory.cpp index 2f6f6ca3b..7261b9355 100644 --- a/replication_listener/access_method_factory.cpp +++ b/replication_listener/access_method_factory.cpp @@ -1,10 +1,10 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2013, SkySQL Ab +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: - Removed unnecessary file driver Author: Jan Lindström (jan.lindstrom@skysql.com diff --git a/replication_listener/basic_content_handler.cpp b/replication_listener/basic_content_handler.cpp index 7d24b9c0f..9b209ab28 100644 --- a/replication_listener/basic_content_handler.cpp +++ b/replication_listener/basic_content_handler.cpp @@ -1,10 +1,10 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2013, SkySQL Ab +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/binary_log.cpp b/replication_listener/binary_log.cpp index 0e643269d..199cf65c4 100644 --- a/replication_listener/binary_log.cpp +++ b/replication_listener/binary_log.cpp @@ -1,10 +1,10 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2013, SkySQL Ab +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.cpp b/replication_listener/binlog_driver.cpp index ef2512b5c..86c3ea954 100644 --- a/replication_listener/binlog_driver.cpp +++ b/replication_listener/binlog_driver.cpp @@ -1,10 +1,10 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. - Copyright (c) 2013, SkySQL Ab + 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 @@ 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/binlog_event.cpp b/replication_listener/binlog_event.cpp index 77723e310..d1f4da802 100644 --- a/replication_listener/binlog_event.cpp +++ b/replication_listener/binlog_event.cpp @@ -1,10 +1,10 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2013, SkySQL Ab +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/gtid.cpp b/replication_listener/gtid.cpp index e5e1c1516..ed9d80bea 100644 --- a/replication_listener/gtid.cpp +++ b/replication_listener/gtid.cpp @@ -1,8 +1,8 @@ /* -Copyright (C) 2013, SkySQL Ab +Copyright (C) 2013, MariaDB Corporation Ab -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. diff --git a/replication_listener/protocol.cpp b/replication_listener/protocol.cpp index 0bc58b458..8d07f6877 100644 --- a/replication_listener/protocol.cpp +++ b/replication_listener/protocol.cpp @@ -1,10 +1,10 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2013, SkySQL Ab +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.cpp b/replication_listener/tcp_driver.cpp index a36b8bf68..216077249 100644 --- a/replication_listener/tcp_driver.cpp +++ b/replication_listener/tcp_driver.cpp @@ -1,10 +1,10 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2013, SkySQL Ab +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 error handling using exceptions diff --git a/replication_listener/tests/event_dump.cpp b/replication_listener/tests/event_dump.cpp index 3fd33d1a7..d9c415374 100644 --- a/replication_listener/tests/event_dump.cpp +++ b/replication_listener/tests/event_dump.cpp @@ -1,8 +1,8 @@ /* -Copyright (C) 2013, SkySQL Ab +Copyright (C) 2013, MariaDB Corporation Ab -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. diff --git a/table_replication_consistency/table_replication_consistency.cpp b/table_replication_consistency/table_replication_consistency.cpp index 396829ef8..e29fc0cd7 100644 --- a/table_replication_consistency/table_replication_consistency.cpp +++ b/table_replication_consistency/table_replication_consistency.cpp @@ -1,8 +1,8 @@ /* -Copyright (C) 2013, SkySQL Ab +Copyright (C) 2013, MariaDB Corporation Ab -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. @@ -76,7 +76,7 @@ tb_replication_consistency_init( replication_listener_t *rpl, /*!< in: Server definition. */ size_t n_servers, /*!< in: Number of servers */ - unsigned int gateway_server_id, /*!< in: Gateway slave + unsigned int gateway_server_id, /*!< in: MaxScale slave server id. */ int trace_level) /*!< in: Trace level */ { @@ -288,7 +288,7 @@ int tb_replication_consistency_reconnect( /*=================================*/ replication_listener_t* rpl, /*!< in: Server definition.*/ - unsigned int gateway_server_id) /*!< in: Gateway slave + unsigned int gateway_server_id) /*!< in: MaxScale slave server id. */ { std::string errmsg =""; diff --git a/table_replication_consistency/table_replication_consistency.h b/table_replication_consistency/table_replication_consistency.h index 0d5faefde..f900d1bf0 100644 --- a/table_replication_consistency/table_replication_consistency.h +++ b/table_replication_consistency/table_replication_consistency.h @@ -116,7 +116,7 @@ tb_replication_consistency_init( replication_listener_t *rpl, /*!< in: Server definition. */ size_t n_servers, /*!< in: Number of servers */ - unsigned int gateway_server_id, /*!< in: Gateway slave + unsigned int gateway_server_id, /*!< in: MaxScale slave server id. */ int trace_level); /*!< in: trace level */ @@ -148,7 +148,7 @@ int tb_replication_consistency_reconnect( /*=================================*/ replication_listener_t* rpl, /*!< in: Server definition.*/ - unsigned int gateway_server_id); /*!< in: Gateway slave + unsigned int gateway_server_id); /*!< in: MaxScale slave server id. */ /***********************************************************************//** diff --git a/table_replication_consistency/table_replication_listener.cpp b/table_replication_consistency/table_replication_listener.cpp index 9db67292f..283b49984 100644 --- a/table_replication_consistency/table_replication_listener.cpp +++ b/table_replication_consistency/table_replication_listener.cpp @@ -1,8 +1,8 @@ /* -Copyright (C) 2013, SkySQL Ab +Copyright (C) 2013, MariaDB Corporation Ab -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. diff --git a/table_replication_consistency/table_replication_metadata.cpp b/table_replication_consistency/table_replication_metadata.cpp index fbcc425e7..b25a350ed 100644 --- a/table_replication_consistency/table_replication_metadata.cpp +++ b/table_replication_consistency/table_replication_metadata.cpp @@ -1,8 +1,8 @@ /* -Copyright (C) 2013, SkySQL Ab +Copyright (C) 2013, MariaDB Corporation Ab -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. diff --git a/table_replication_consistency/table_replication_parser.cpp b/table_replication_consistency/table_replication_parser.cpp index a14f825df..999a9b083 100644 --- a/table_replication_consistency/table_replication_parser.cpp +++ b/table_replication_consistency/table_replication_parser.cpp @@ -1,8 +1,8 @@ /* -Copyright (C) 2013, SkySQL Ab +Copyright (C) 2013, MariaDB Corporation Ab -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.