From ea6a3f56d6db5790d826867ede088e455fb837dd Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Mon, 29 Sep 2014 13:07:30 +0300
Subject: [PATCH 01/25] Fix to bug 487:
 http://bugs.skysql.com/show_bug.cgi?id=487

Changed all arithmetic operations on raw void pointers to properly use uint8_t pointers instead.
---
 server/core/buffer.c    | 2 +-
 server/include/buffer.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/core/buffer.c b/server/core/buffer.c
index 290da6bde..bee646976 100644
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@@ -87,7 +87,7 @@ SHARED_BUF	*sbuf;
 	}
 	spinlock_init(&rval->gwbuf_lock);
 	rval->start = sbuf->data;
-	rval->end = rval->start + size;
+	rval->end = (void*)((uint8_t*)rval->start + size);
 	sbuf->refcount = 1;
 	rval->sbuf = sbuf;
 	rval->next = NULL;
diff --git a/server/include/buffer.h b/server/include/buffer.h
index eefdd431d..9ea473b71 100644
--- a/server/include/buffer.h
+++ b/server/include/buffer.h
@@ -47,6 +47,7 @@
 #include <skygw_debug.h>
 #include <hint.h>
 #include <spinlock.h>
+#include <stdint.h>
 
 
 EXTERN_C_BLOCK_BEGIN
@@ -150,15 +151,15 @@ typedef struct gwbuf {
 #define GWBUF_DATA(b)		((b)->start)
 
 /*< Number of bytes in the individual buffer */
-#define GWBUF_LENGTH(b)		((b)->end - (b)->start)
+#define GWBUF_LENGTH(b)		((unsigned int)(((uint8_t*)(b)->end) - ((uint8_t*)(b)->start)))
 
 /*< True if all bytes in the buffer have been consumed */
 #define GWBUF_EMPTY(b)		((b)->start == (b)->end)
 
 /*< Consume a number of bytes in the buffer */
-#define GWBUF_CONSUME(b, bytes)	(b)->start += (bytes)
+#define GWBUF_CONSUME(b, bytes)	(b)->start = (void*)((uint8_t*)(b)->start + (bytes))
 
-#define GWBUF_RTRIM(b, bytes)	(b)->end -= (bytes)
+#define GWBUF_RTRIM(b, bytes)	(b)->end = (void*)((uint8_t*)(b)->end - (bytes))
 
 #define GWBUF_TYPE(b) (b)->gwbuf_type
 /*<

From 686d28a1f03641107d6da48d8960a7caa4215c18 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Mon, 29 Sep 2014 13:21:26 +0300
Subject: [PATCH 02/25] Fix to bug #506,
 http://bugs.skysql.com/show_bug.cgi?id=506 If debug and/or trace log is
 stored to shared memory, the absolute path to file is now
 /dev/shm/<pid>/skygw_[trace1|debug1].log

---
 log_manager/log_manager.cc | 30 +++++++++++++++++++++++++++---
 utils/skygw_utils.cc       | 14 +++++++++++++-
 utils/skygw_utils.h        |  1 +
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 2b274a610..8e33aed16 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -75,7 +75,7 @@ int lm_enabled_logfiles_bitmask = 0;
  * Path to directory in which all files are stored to shared memory
  * by the OS.
  */
-const char* shm_pathname = "/dev/shm";
+const char* shm_pathname_prefix = "/dev/shm/";
 
 /** Logfile ids from call argument '-s' */
 char* shmem_id_str     = NULL;
@@ -2064,7 +2064,31 @@ static bool logfile_init(
          * directory.
          */
         if (store_shmem) {
+#if 1
+		char* c;
+		pid_t pid = getpid();
+		int   len = strlen(shm_pathname_prefix)+
+			get_decimal_len((size_t)pid);
+			
+		c = (char *)calloc(len, sizeof(char));
+		
+		if (c == NULL)
+		{
+			succp = false;
+			goto file_create_fail;
+		}
+		sprintf(c, "%s%d", shm_pathname_prefix, pid);
+		logfile->lf_filepath = c;
+		
+		if (mkdir(c, S_IRWXU | S_IRWXG) != 0 &&
+			errno != EEXIST)
+		{
+			succp = false;
+			goto file_create_fail;
+		}
+#else
                 logfile->lf_filepath = strdup(shm_pathname);
+#endif
                 logfile->lf_linkpath = strdup(fn->fn_logpath);
                 logfile->lf_linkpath = add_slash(logfile->lf_linkpath);
         } else {
@@ -2146,7 +2170,7 @@ static bool logfile_init(
                                 }
                         }
                 }
-        file_create_fail:
+file_create_fail:
                 if (namecreatefail || nameconflicts)
                 {
                         logfile->lf_name_seqno += 1;
@@ -2161,7 +2185,7 @@ static bool logfile_init(
                                 free(logfile->lf_full_link_name);
                                 logfile->lf_full_link_name = NULL;
                         }
-
+			goto return_with_succp;
                 }
         } while (namecreatefail || nameconflicts);
         /**
diff --git a/utils/skygw_utils.cc b/utils/skygw_utils.cc
index 4845c73a2..23cac20d9 100644
--- a/utils/skygw_utils.cc
+++ b/utils/skygw_utils.cc
@@ -1955,7 +1955,19 @@ retblock:
         return newstr;
 }
 
-
+/** 
+ * Calculate the number of decimal numbers from a size_t value.
+ * 
+ * @param	value	value
+ * 
+ * @return	number of decimal numbers of which the value consists of
+ * 		value==123 returns 3, for example.
+ */
+size_t get_decimal_len(
+	size_t value)
+{
+	return value > 0 ? (size_t) log10 ((double) value) + 1 : 1;
+}
 
 
 
diff --git a/utils/skygw_utils.h b/utils/skygw_utils.h
index a54859392..80793fbca 100644
--- a/utils/skygw_utils.h
+++ b/utils/skygw_utils.h
@@ -192,6 +192,7 @@ int skygw_rwlock_unlock(skygw_rwlock_t* rwlock);
 int skygw_rwlock_init(skygw_rwlock_t** rwlock);
 
 int atomic_add(int *variable, int value);
+size_t get_decimal_len(size_t s);
 
 EXTERN_C_BLOCK_BEGIN
 

From 3b9175d957efcf3e9a32123aa33e6f5d40eb3cec Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Mon, 29 Sep 2014 13:52:14 +0300
Subject: [PATCH 03/25] Clean up

---
 log_manager/log_manager.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 8e33aed16..cb7ae78f8 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -2063,8 +2063,8 @@ static bool logfile_init(
          * pointing to shm file is created and located to the file
          * directory.
          */
-        if (store_shmem) {
-#if 1
+        if (store_shmem) 
+	{
 		char* c;
 		pid_t pid = getpid();
 		int   len = strlen(shm_pathname_prefix)+
@@ -2086,12 +2086,11 @@ static bool logfile_init(
 			succp = false;
 			goto file_create_fail;
 		}
-#else
-                logfile->lf_filepath = strdup(shm_pathname);
-#endif
                 logfile->lf_linkpath = strdup(fn->fn_logpath);
                 logfile->lf_linkpath = add_slash(logfile->lf_linkpath);
-        } else {
+        } 
+        else 
+	{
                 logfile->lf_filepath = strdup(fn->fn_logpath);
         }
         logfile->lf_filepath = add_slash(logfile->lf_filepath);

From 1111059ee8332fc20d9abb53480abc4446be329e Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Mon, 29 Sep 2014 13:54:11 +0300
Subject: [PATCH 04/25] Fix to bug 456 Added a script that unpacks RPMs to a
 directory

---
 unpack_rmp.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100755 unpack_rmp.sh

diff --git a/unpack_rmp.sh b/unpack_rmp.sh
new file mode 100755
index 000000000..ffb870680
--- /dev/null
+++ b/unpack_rmp.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#This script unpacks the RPM to the provided directory
+
+if [[ $# -lt 2 ]]
+then
+	echo "Usage: unpack_rpm.sh <path to RPM package> <installation directory>"
+	exit 0
+fi
+mkdir -p $2
+cd $2 && rpm2cpio $1 | cpio -id

From 9ee82ad2dafe094ae9d00af46e7531b03182ca6f Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Mon, 29 Sep 2014 14:27:29 +0300
Subject: [PATCH 05/25] Script now unpacks all MariaDB RPMs in the folder.

---
 unpack_rmp.sh | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/unpack_rmp.sh b/unpack_rmp.sh
index ffb870680..4158c6a84 100755
--- a/unpack_rmp.sh
+++ b/unpack_rmp.sh
@@ -2,10 +2,31 @@
 
 #This script unpacks the RPM to the provided directory
 
+unpack_to(){
+	cd $2 && rpm2cpio $1 | cpio -id;
+}
+
+
 if [[ $# -lt 2 ]]
 then
-	echo "Usage: unpack_rpm.sh <path to RPM package> <installation directory>"
+	echo "Usage: unpack_rpm.sh <path to MariaDB RPMs> <installation directory>"
 	exit 0
 fi
-mkdir -p $2
-cd $2 && rpm2cpio $1 | cpio -id
+
+SOURCE=$1
+DEST=$2
+FILES=$(ls $SOURCE |grep -i mariadb.*`uname -m`.*.rpm)
+
+if [[ ! -d $DEST ]]
+then
+	mkdir -p $DEST
+fi
+
+echo "Unpacking RPMs to: $DEST"
+
+for rpm in $FILES
+do
+	echo "Unpacking $rpm..."
+	unpack_to $SOURCE/$rpm $DEST 
+done
+

From c344231f8024c93a1775d2ad1c302e20b251645f Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Tue, 30 Sep 2014 13:02:10 +0300
Subject: [PATCH 06/25] Renamed all occurences of SkySQL to MariaDB Corporation

---
 client/maxadmin.c                                   |   2 +-
 log_manager/log_manager.cc                          |   2 +-
 log_manager/log_manager.h                           |   2 +-
 log_manager/test/testlog.c                          |   2 +-
 log_manager/test/testorder.c                        |   2 +-
 query_classifier/query_classifier.cc                |   2 +-
 query_classifier/query_classifier.h                 |   2 +-
 replication_listener/access_method_factory.h        |   2 +-
 replication_listener/basic_content_handler.h        |   2 +-
 replication_listener/binlog_api.h                   |   2 +-
 replication_listener/binlog_driver.h                |   2 +-
 replication_listener/binlog_event.h                 |   2 +-
 replication_listener/gtid.h                         |   2 +-
 replication_listener/listener_exception.h           |   2 +-
 replication_listener/tcp_driver.h                   |   2 +-
 server/core/adminusers.c                            |   2 +-
 server/core/atomic.c                                |   2 +-
 server/core/buffer.c                                |   2 +-
 server/core/config.c                                |   2 +-
 server/core/dbusers.c                               |   2 +-
 server/core/dcb.c                                   |   2 +-
 server/core/filter.c                                |   2 +-
 server/core/gateway.c                               |   4 ++--
 server/core/gw_utils.c                              |   2 +-
 server/core/gwbitmask.c                             |   2 +-
 server/core/hashtable.c                             |   2 +-
 server/core/hint.c                                  |   2 +-
 server/core/housekeeper.c                           |   2 +-
 server/core/load_utils.c                            |   2 +-
 server/core/maxkeys.c                               |   2 +-
 server/core/maxpasswd.c                             |   2 +-
 server/core/modutil.c                               |   2 +-
 server/core/monitor.c                               |   2 +-
 server/core/poll.c                                  |   2 +-
 server/core/secrets.c                               |   2 +-
 server/core/server.c                                |   2 +-
 server/core/service.c                               |   2 +-
 server/core/session.c                               |   2 +-
 server/core/spinlock.c                              |   2 +-
 server/core/test/test_mysql_users.c                 |   2 +-
 server/core/test/testadminusers.c                   |   2 +-
 server/core/test/testfilter.c                       |   2 +-
 server/core/test/testhash.c                         |   2 +-
 server/core/test/testspinlock.c                     |   2 +-
 server/core/thread.c                                |   2 +-
 server/core/users.c                                 |   2 +-
 server/core/utils.c                                 |   2 +-
 server/include/adminusers.h                         |   2 +-
 server/include/atomic.h                             |   2 +-
 server/include/buffer.h                             |   2 +-
 server/include/config.h                             |   2 +-
 server/include/dbusers.h                            |   2 +-
 server/include/dcb.h                                |   2 +-
 server/include/filter.h                             |   2 +-
 server/include/gwbitmask.h                          |   2 +-
 server/include/hashtable.h                          |   2 +-
 server/include/hint.h                               |   2 +-
 server/include/housekeeper.h                        |   2 +-
 server/include/maxscale.h                           |   2 +-
 server/include/modinfo.h                            |   2 +-
 server/include/modules.h                            |   2 +-
 server/include/modutil.h                            |   2 +-
 server/include/monitor.h                            |   2 +-
 server/include/poll.h                               |   2 +-
 server/include/rdtsc.h                              |   2 +-
 server/include/router.h                             |   2 +-
 server/include/secrets.h                            |   2 +-
 server/include/server.h                             |   2 +-
 server/include/service.h                            |   2 +-
 server/include/session.h                            |   2 +-
 server/include/spinlock.h                           |   2 +-
 server/include/thread.h                             |   2 +-
 server/include/users.h                              |   2 +-
 server/inih/._ini.c                                 | Bin
 server/inih/._ini.h                                 | Bin
 server/inih/cpp/._INIReader.h                       | Bin
 server/inih/cpp/INIReader.h                         |   0
 server/inih/examples/._ini_dump.c                   | Bin
 server/inih/examples/._ini_example.c                | Bin
 server/inih/examples/._ini_xmacros.c                | Bin
 server/inih/examples/ini_dump.c                     |   0
 server/inih/examples/ini_example.c                  |   0
 server/inih/examples/ini_xmacros.c                  |   0
 server/inih/ini.c                                   |   0
 server/inih/ini.h                                   |   0
 server/inih/tests/._unittest.c                      | Bin
 server/inih/tests/unittest.c                        |   0
 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/include/blr.h                        |   2 +-
 server/modules/include/debugcli.h                   |   2 +-
 server/modules/include/httpd.h                      |   2 +-
 server/modules/include/maxscaled.h                  |   2 +-
 .../modules/include/mysql_client_server_protocol.h  |   2 +-
 server/modules/include/mysqlhint.h                  |   2 +-
 server/modules/include/readconnection.h             |   2 +-
 server/modules/include/readwritesplit.h             |   2 +-
 server/modules/include/telnetd.h                    |   2 +-
 server/modules/monitor/galera_mon.c                 |   2 +-
 server/modules/monitor/mysql_mon.c                  |   2 +-
 server/modules/monitor/mysqlmon.h                   |   2 +-
 server/modules/monitor/ndbcluster_mon.c             |   2 +-
 server/modules/protocol/httpd.c                     |   2 +-
 server/modules/protocol/maxscaled.c                 |   2 +-
 server/modules/protocol/mysql_backend.c             |   2 +-
 server/modules/protocol/mysql_client.c              |   2 +-
 server/modules/protocol/mysql_common.c              |   2 +-
 server/modules/protocol/telnetd.c                   |   2 +-
 server/modules/routing/GaleraHACRoute.c             |   2 +-
 server/modules/routing/binlog/blr.c                 |   2 +-
 server/modules/routing/binlog/blr_cache.c           |   2 +-
 server/modules/routing/binlog/blr_file.c            |   2 +-
 server/modules/routing/binlog/blr_master.c          |   2 +-
 server/modules/routing/binlog/blr_slave.c           |   2 +-
 server/modules/routing/cli.c                        |   2 +-
 server/modules/routing/debugcli.c                   |   2 +-
 server/modules/routing/debugcmd.c                   |   2 +-
 server/modules/routing/readconnroute.c              |   2 +-
 .../modules/routing/readwritesplit/readwritesplit.c |   2 +-
 server/modules/routing/testroute.c                  |   2 +-
 server/modules/routing/webserver.c                  |   2 +-
 .../table_replication_consistency.h                 |   2 +-
 .../table_replication_listener.h                    |   2 +-
 .../table_replication_metadata.h                    |   2 +-
 .../table_replication_parser.h                      |   2 +-
 utils/skygw_debug.h                                 |   2 +-
 utils/skygw_types.h                                 |   2 +-
 utils/skygw_utils.cc                                |   2 +-
 134 files changed, 121 insertions(+), 121 deletions(-)
 mode change 100755 => 100644 server/inih/._ini.c
 mode change 100755 => 100644 server/inih/._ini.h
 mode change 100755 => 100644 server/inih/cpp/._INIReader.h
 mode change 100755 => 100644 server/inih/cpp/INIReader.h
 mode change 100755 => 100644 server/inih/examples/._ini_dump.c
 mode change 100755 => 100644 server/inih/examples/._ini_example.c
 mode change 100755 => 100644 server/inih/examples/._ini_xmacros.c
 mode change 100755 => 100644 server/inih/examples/ini_dump.c
 mode change 100755 => 100644 server/inih/examples/ini_example.c
 mode change 100755 => 100644 server/inih/examples/ini_xmacros.c
 mode change 100755 => 100644 server/inih/ini.c
 mode change 100755 => 100644 server/inih/ini.h
 mode change 100755 => 100644 server/inih/tests/._unittest.c
 mode change 100755 => 100644 server/inih/tests/unittest.c

diff --git a/client/maxadmin.c b/client/maxadmin.c
index 97459171e..45e010bb3 100644
--- a/client/maxadmin.c
+++ b/client/maxadmin.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 2b274a610..5a4f7d973 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -13,7 +13,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
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/log_manager/log_manager.h b/log_manager/log_manager.h
index 6a4c1d6cc..121897be4 100644
--- a/log_manager/log_manager.h
+++ b/log_manager/log_manager.h
@@ -13,7 +13,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
  */
 
 
diff --git a/log_manager/test/testlog.c b/log_manager/test/testlog.c
index c21d30e17..9b6539444 100644
--- a/log_manager/test/testlog.c
+++ b/log_manager/test/testlog.c
@@ -13,7 +13,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
  */
 
 
diff --git a/log_manager/test/testorder.c b/log_manager/test/testorder.c
index e2bb94a7b..043d39758 100644
--- a/log_manager/test/testorder.c
+++ b/log_manager/test/testorder.c
@@ -13,7 +13,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
  */
 
 #include <unistd.h>
diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index ecf305308..3a14bc7cb 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA.
  * 
- * Copyright SkySQL Ab
+ * Copyright MariaDB Corporation Ab
  * 
  * @file 
  * 
diff --git a/query_classifier/query_classifier.h b/query_classifier/query_classifier.h
index 4ad960524..6ade74f7a 100644
--- a/query_classifier/query_classifier.h
+++ b/query_classifier/query_classifier.h
@@ -13,7 +13,7 @@ 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
+Copyright MariaDB Corporation Ab
 
 */
 
diff --git a/replication_listener/access_method_factory.h b/replication_listener/access_method_factory.h
index af245fa36..2a3b6d73e 100644
--- a/replication_listener/access_method_factory.h
+++ b/replication_listener/access_method_factory.h
@@ -1,7 +1,7 @@
 /*
 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
diff --git a/replication_listener/basic_content_handler.h b/replication_listener/basic_content_handler.h
index 449d0f8d4..55a52d8b2 100644
--- a/replication_listener/basic_content_handler.h
+++ b/replication_listener/basic_content_handler.h
@@ -1,7 +1,7 @@
 /*
 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
diff --git a/replication_listener/binlog_api.h b/replication_listener/binlog_api.h
index 2a73423af..4920bec30 100644
--- a/replication_listener/binlog_api.h
+++ b/replication_listener/binlog_api.h
@@ -1,7 +1,7 @@
 /*
 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
diff --git a/replication_listener/binlog_driver.h b/replication_listener/binlog_driver.h
index cdec99e06..9d0cbb4cb 100644
--- a/replication_listener/binlog_driver.h
+++ b/replication_listener/binlog_driver.h
@@ -1,7 +1,7 @@
 /*
 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
diff --git a/replication_listener/binlog_event.h b/replication_listener/binlog_event.h
index 2b0d650e2..74022287e 100644
--- a/replication_listener/binlog_event.h
+++ b/replication_listener/binlog_event.h
@@ -1,7 +1,7 @@
 /*
 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
diff --git a/replication_listener/gtid.h b/replication_listener/gtid.h
index b0ca43548..620955e68 100644
--- a/replication_listener/gtid.h
+++ b/replication_listener/gtid.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, SkySQL Ab
+Copyright (C) 2013, MariaDB Corporation Ab
 
 This file is distributed as part of the SkySQL Gateway. It is free
 software: you can redistribute it and/or modify it under the terms of the
diff --git a/replication_listener/listener_exception.h b/replication_listener/listener_exception.h
index b9da4f0ae..94fb44fff 100644
--- a/replication_listener/listener_exception.h
+++ b/replication_listener/listener_exception.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, SkySQL Ab
+Copyright (C) 2013, MariaDB Corporation Ab
 
 
 This file is distributed as part of the SkySQL Gateway. It is free
diff --git a/replication_listener/tcp_driver.h b/replication_listener/tcp_driver.h
index 268f3dcee..035173608 100644
--- a/replication_listener/tcp_driver.h
+++ b/replication_listener/tcp_driver.h
@@ -1,7 +1,7 @@
 /*
 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
diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 61cd7c077..e7c118f53 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/atomic.c b/server/core/atomic.c
index f8dd4a07f..8730b27c6 100644
--- a/server/core/atomic.c
+++ b/server/core/atomic.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/buffer.c b/server/core/buffer.c
index 290da6bde..4ca0f4fd1 100644
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/config.c b/server/core/config.c
index 995e0e0f4..9c8c5f628 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 4f8de392b..78601a0f9 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/dcb.c b/server/core/dcb.c
index 0b2b038e7..9d89133aa 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/filter.c b/server/core/filter.c
index b199e931f..fef852d40 100644
--- a/server/core/filter.c
+++ b/server/core/filter.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/gateway.c b/server/core/gateway.c
index f2c1eefb2..cfa1ca78e 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -13,7 +13,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
  * 
  */
 
@@ -1539,7 +1539,7 @@ int main(int argc, char **argv)
         }
         LOGIF(LM, (skygw_log_write(
                 LOGFILE_MESSAGE,
-                "SkySQL MaxScale %s (C) SkySQL Ab 2013,2014",
+                "SkySQL MaxScale %s (C) MariaDB Corporation Ab 2013,2014",
 		MAXSCALE_VERSION))); 
         LOGIF(LM, (skygw_log_write(
                 LOGFILE_MESSAGE,
diff --git a/server/core/gw_utils.c b/server/core/gw_utils.c
index 2662ab41d..d1e23eb7f 100644
--- a/server/core/gw_utils.c
+++ b/server/core/gw_utils.c
@@ -13,7 +13,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
  * 
  */
 
diff --git a/server/core/gwbitmask.c b/server/core/gwbitmask.c
index d3f031080..92958e26e 100644
--- a/server/core/gwbitmask.c
+++ b/server/core/gwbitmask.c
@@ -13,7 +13,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
  */
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/hashtable.c b/server/core/hashtable.c
index 0f129e825..41c0b53c5 100644
--- a/server/core/hashtable.c
+++ b/server/core/hashtable.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/hint.c b/server/core/hint.c
index 2d716771a..052c02486 100644
--- a/server/core/hint.c
+++ b/server/core/hint.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/housekeeper.c b/server/core/housekeeper.c
index fe6cb9047..eae08d8e8 100644
--- a/server/core/housekeeper.c
+++ b/server/core/housekeeper.c
@@ -13,7 +13,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
  */
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/load_utils.c b/server/core/load_utils.c
index cba0c6533..67330b10b 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/maxkeys.c b/server/core/maxkeys.c
index 9ae59f8c7..66a5d0145 100644
--- a/server/core/maxkeys.c
+++ b/server/core/maxkeys.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/maxpasswd.c b/server/core/maxpasswd.c
index d11980ba3..ab3986b62 100644
--- a/server/core/maxpasswd.c
+++ b/server/core/maxpasswd.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/modutil.c b/server/core/modutil.c
index ec7f8530b..b0d846abb 100644
--- a/server/core/modutil.c
+++ b/server/core/modutil.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/monitor.c b/server/core/monitor.c
index 101ce2e10..9a41379f2 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/poll.c b/server/core/poll.c
index 12cb1d69d..678016068 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <string.h>
diff --git a/server/core/secrets.c b/server/core/secrets.c
index f9ac62aef..768323370 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -13,7 +13,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
  */
 
 #include <secrets.h>
diff --git a/server/core/server.c b/server/core/server.c
index 43c535d0e..1dcf8f6aa 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/service.c b/server/core/service.c
index a5e08f937..f6b74a92d 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/session.c b/server/core/session.c
index eb9d42a2b..573f1e619 100644
--- a/server/core/session.c
+++ b/server/core/session.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/spinlock.c b/server/core/spinlock.c
index ce64042e3..eeb1c8733 100644
--- a/server/core/spinlock.c
+++ b/server/core/spinlock.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/test/test_mysql_users.c b/server/core/test/test_mysql_users.c
index 97476b3ae..7b01d23f6 100644
--- a/server/core/test/test_mysql_users.c
+++ b/server/core/test/test_mysql_users.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/test/testadminusers.c b/server/core/test/testadminusers.c
index 00ec3a452..4a67b1f5b 100644
--- a/server/core/test/testadminusers.c
+++ b/server/core/test/testadminusers.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/test/testfilter.c b/server/core/test/testfilter.c
index 55f7fadf3..bf97d7897 100644
--- a/server/core/test/testfilter.c
+++ b/server/core/test/testfilter.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/test/testhash.c b/server/core/test/testhash.c
index 3fa9d7f0d..9fc2fb9cf 100644
--- a/server/core/test/testhash.c
+++ b/server/core/test/testhash.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/test/testspinlock.c b/server/core/test/testspinlock.c
index ecdbdf108..f6ea810c8 100644
--- a/server/core/test/testspinlock.c
+++ b/server/core/test/testspinlock.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/core/thread.c b/server/core/thread.c
index dded79507..187cf884d 100644
--- a/server/core/thread.c
+++ b/server/core/thread.c
@@ -13,7 +13,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
  */
 #include <thread.h>
 #include <pthread.h>
diff --git a/server/core/users.c b/server/core/users.c
index 3b4dadf15..16600ed62 100644
--- a/server/core/users.c
+++ b/server/core/users.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/utils.c b/server/core/utils.c
index 1b8c6b5fe..09cefe277 100644
--- a/server/core/utils.c
+++ b/server/core/utils.c
@@ -13,7 +13,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
  * 
  */
 
diff --git a/server/include/adminusers.h b/server/include/adminusers.h
index 07afa5390..fefe456c6 100644
--- a/server/include/adminusers.h
+++ b/server/include/adminusers.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/atomic.h b/server/include/atomic.h
index 7fea0926e..2b9b21435 100644
--- a/server/include/atomic.h
+++ b/server/include/atomic.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/buffer.h b/server/include/buffer.h
index eefdd431d..c60a2db8c 100644
--- a/server/include/buffer.h
+++ b/server/include/buffer.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/config.h b/server/include/config.h
index 659fb6378..6ee7acdd1 100644
--- a/server/include/config.h
+++ b/server/include/config.h
@@ -15,7 +15,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
  */
 #include <skygw_utils.h>
 
diff --git a/server/include/dbusers.h b/server/include/dbusers.h
index 3b0afe50b..99f4a2c79 100644
--- a/server/include/dbusers.h
+++ b/server/include/dbusers.h
@@ -15,7 +15,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
  */
 
 #include <service.h>
diff --git a/server/include/dcb.h b/server/include/dcb.h
index 72686b7b7..bc3b1d019 100644
--- a/server/include/dcb.h
+++ b/server/include/dcb.h
@@ -15,7 +15,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
  */
 #include <spinlock.h>
 #include <buffer.h>
diff --git a/server/include/filter.h b/server/include/filter.h
index 3076587e6..d40b5f53b 100644
--- a/server/include/filter.h
+++ b/server/include/filter.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/gwbitmask.h b/server/include/gwbitmask.h
index 6b3b6b622..74cf7b7ec 100644
--- a/server/include/gwbitmask.h
+++ b/server/include/gwbitmask.h
@@ -15,7 +15,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
  */
 #include <spinlock.h>
 
diff --git a/server/include/hashtable.h b/server/include/hashtable.h
index 175bd5d32..2b9cd5c75 100644
--- a/server/include/hashtable.h
+++ b/server/include/hashtable.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/hint.h b/server/include/hint.h
index 03c319142..4cc687731 100644
--- a/server/include/hint.h
+++ b/server/include/hint.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/housekeeper.h b/server/include/housekeeper.h
index 35e76e80d..ec30f8fe4 100644
--- a/server/include/housekeeper.h
+++ b/server/include/housekeeper.h
@@ -15,7 +15,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
  */
 #include <time.h>
 
diff --git a/server/include/maxscale.h b/server/include/maxscale.h
index 4fb5dd75f..3294b2b35 100644
--- a/server/include/maxscale.h
+++ b/server/include/maxscale.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/modinfo.h b/server/include/modinfo.h
index bc4107b39..759cea0fb 100644
--- a/server/include/modinfo.h
+++ b/server/include/modinfo.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/modules.h b/server/include/modules.h
index 199e3a24b..256a721e6 100644
--- a/server/include/modules.h
+++ b/server/include/modules.h
@@ -15,7 +15,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
  */
 #include <dcb.h>
 #include <modinfo.h>
diff --git a/server/include/modutil.h b/server/include/modutil.h
index a0624752a..593e1cc61 100644
--- a/server/include/modutil.h
+++ b/server/include/modutil.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/monitor.h b/server/include/monitor.h
index 04337d761..209ab443e 100644
--- a/server/include/monitor.h
+++ b/server/include/monitor.h
@@ -15,7 +15,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
  */
 #include <server.h>
 #include <dcb.h>
diff --git a/server/include/poll.h b/server/include/poll.h
index 6524f1bbb..354eae33a 100644
--- a/server/include/poll.h
+++ b/server/include/poll.h
@@ -15,7 +15,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
  */
 #include <dcb.h>
 #include <gwbitmask.h>
diff --git a/server/include/rdtsc.h b/server/include/rdtsc.h
index 50a752f31..27fe49006 100644
--- a/server/include/rdtsc.h
+++ b/server/include/rdtsc.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/router.h b/server/include/router.h
index 6c29fe1bf..272010143 100644
--- a/server/include/router.h
+++ b/server/include/router.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/secrets.h b/server/include/secrets.h
index 0325d75ae..f82602d85 100644
--- a/server/include/secrets.h
+++ b/server/include/secrets.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/server.h b/server/include/server.h
index f6d146ccd..a6f80acf2 100644
--- a/server/include/server.h
+++ b/server/include/server.h
@@ -15,7 +15,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
  */
 #include <dcb.h>
 
diff --git a/server/include/service.h b/server/include/service.h
index 139a08056..bac7fd139 100644
--- a/server/include/service.h
+++ b/server/include/service.h
@@ -15,7 +15,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
  */
 
 #include <time.h>
diff --git a/server/include/session.h b/server/include/session.h
index cbd43fe40..773f75575 100644
--- a/server/include/session.h
+++ b/server/include/session.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/spinlock.h b/server/include/spinlock.h
index e5f938815..f863fcabb 100644
--- a/server/include/spinlock.h
+++ b/server/include/spinlock.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/include/thread.h b/server/include/thread.h
index e3ea6f0dc..33c3aaa5c 100644
--- a/server/include/thread.h
+++ b/server/include/thread.h
@@ -15,7 +15,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
  */
 #include <pthread.h>
 
diff --git a/server/include/users.h b/server/include/users.h
index ffa091e3b..9364f19b9 100644
--- a/server/include/users.h
+++ b/server/include/users.h
@@ -15,7 +15,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
  */
 #include <hashtable.h>
 #include <dcb.h>
diff --git a/server/inih/._ini.c b/server/inih/._ini.c
old mode 100755
new mode 100644
diff --git a/server/inih/._ini.h b/server/inih/._ini.h
old mode 100755
new mode 100644
diff --git a/server/inih/cpp/._INIReader.h b/server/inih/cpp/._INIReader.h
old mode 100755
new mode 100644
diff --git a/server/inih/cpp/INIReader.h b/server/inih/cpp/INIReader.h
old mode 100755
new mode 100644
diff --git a/server/inih/examples/._ini_dump.c b/server/inih/examples/._ini_dump.c
old mode 100755
new mode 100644
diff --git a/server/inih/examples/._ini_example.c b/server/inih/examples/._ini_example.c
old mode 100755
new mode 100644
diff --git a/server/inih/examples/._ini_xmacros.c b/server/inih/examples/._ini_xmacros.c
old mode 100755
new mode 100644
diff --git a/server/inih/examples/ini_dump.c b/server/inih/examples/ini_dump.c
old mode 100755
new mode 100644
diff --git a/server/inih/examples/ini_example.c b/server/inih/examples/ini_example.c
old mode 100755
new mode 100644
diff --git a/server/inih/examples/ini_xmacros.c b/server/inih/examples/ini_xmacros.c
old mode 100755
new mode 100644
diff --git a/server/inih/ini.c b/server/inih/ini.c
old mode 100755
new mode 100644
diff --git a/server/inih/ini.h b/server/inih/ini.h
old mode 100755
new mode 100644
diff --git a/server/inih/tests/._unittest.c b/server/inih/tests/._unittest.c
old mode 100755
new mode 100644
diff --git a/server/inih/tests/unittest.c b/server/inih/tests/unittest.c
old mode 100755
new mode 100644
diff --git a/server/modules/filter/hint/hintfilter.c b/server/modules/filter/hint/hintfilter.c
index e54319d5d..73a392703 100644
--- a/server/modules/filter/hint/hintfilter.c
+++ b/server/modules/filter/hint/hintfilter.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <filter.h>
diff --git a/server/modules/filter/hint/hintparser.c b/server/modules/filter/hint/hintparser.c
index 77d9c98ec..ac487fd11 100644
--- a/server/modules/filter/hint/hintparser.c
+++ b/server/modules/filter/hint/hintparser.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <ctype.h>
diff --git a/server/modules/filter/mqfilter.c b/server/modules/filter/mqfilter.c
index 9761fa777..f56425937 100644
--- a/server/modules/filter/mqfilter.c
+++ b/server/modules/filter/mqfilter.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/filter/qlafilter.c b/server/modules/filter/qlafilter.c
index b3accfbf8..d44660eae 100644
--- a/server/modules/filter/qlafilter.c
+++ b/server/modules/filter/qlafilter.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/filter/regexfilter.c b/server/modules/filter/regexfilter.c
index 79cf70c09..f5d579a4a 100644
--- a/server/modules/filter/regexfilter.c
+++ b/server/modules/filter/regexfilter.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <filter.h>
diff --git a/server/modules/filter/tee.c b/server/modules/filter/tee.c
index 2d164ad42..0694d80ee 100644
--- a/server/modules/filter/tee.c
+++ b/server/modules/filter/tee.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/filter/testfilter.c b/server/modules/filter/testfilter.c
index 289ccf4a2..31d8872b1 100644
--- a/server/modules/filter/testfilter.c
+++ b/server/modules/filter/testfilter.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <filter.h>
diff --git a/server/modules/filter/topfilter.c b/server/modules/filter/topfilter.c
index 9ca281ef1..d7ee07875 100644
--- a/server/modules/filter/topfilter.c
+++ b/server/modules/filter/topfilter.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/include/blr.h b/server/modules/include/blr.h
index 6e151d923..70be1f579 100644
--- a/server/modules/include/blr.h
+++ b/server/modules/include/blr.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/modules/include/debugcli.h b/server/modules/include/debugcli.h
index b373cae6b..66ef1412c 100644
--- a/server/modules/include/debugcli.h
+++ b/server/modules/include/debugcli.h
@@ -15,7 +15,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
  */
 #include <service.h>
 #include <session.h>
diff --git a/server/modules/include/httpd.h b/server/modules/include/httpd.h
index 0d5e65604..ff1ac7dc3 100644
--- a/server/modules/include/httpd.h
+++ b/server/modules/include/httpd.h
@@ -13,7 +13,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
  */
 
 /*
diff --git a/server/modules/include/maxscaled.h b/server/modules/include/maxscaled.h
index fd4e6439e..01a3da227 100644
--- a/server/modules/include/maxscaled.h
+++ b/server/modules/include/maxscaled.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/modules/include/mysql_client_server_protocol.h b/server/modules/include/mysql_client_server_protocol.h
index 18771aecd..942339ce0 100644
--- a/server/modules/include/mysql_client_server_protocol.h
+++ b/server/modules/include/mysql_client_server_protocol.h
@@ -15,7 +15,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
  */
 
 /*
diff --git a/server/modules/include/mysqlhint.h b/server/modules/include/mysqlhint.h
index 3e936b847..45f12b2cf 100644
--- a/server/modules/include/mysqlhint.h
+++ b/server/modules/include/mysqlhint.h
@@ -15,7 +15,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
  */
 
 /*
diff --git a/server/modules/include/readconnection.h b/server/modules/include/readconnection.h
index 589296302..adbfc6958 100644
--- a/server/modules/include/readconnection.h
+++ b/server/modules/include/readconnection.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/modules/include/readwritesplit.h b/server/modules/include/readwritesplit.h
index 482ecea27..703173b58 100644
--- a/server/modules/include/readwritesplit.h
+++ b/server/modules/include/readwritesplit.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/modules/include/telnetd.h b/server/modules/include/telnetd.h
index 2c1bcf32a..bce4ddfe6 100644
--- a/server/modules/include/telnetd.h
+++ b/server/modules/include/telnetd.h
@@ -15,7 +15,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
  */
 
 /**
diff --git a/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index bbde5ca49..0e94b47ac 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index c4cea23ee..8de7309d1 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index eb2d37bcd..2373c4125 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -15,7 +15,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
  */
 #include	<server.h>
 #include	<spinlock.h>
diff --git a/server/modules/monitor/ndbcluster_mon.c b/server/modules/monitor/ndbcluster_mon.c
index b35af4fe2..0b69c605b 100644
--- a/server/modules/monitor/ndbcluster_mon.c
+++ b/server/modules/monitor/ndbcluster_mon.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/protocol/httpd.c b/server/modules/protocol/httpd.c
index 7db1366ad..0e7c2903c 100644
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/protocol/maxscaled.c b/server/modules/protocol/maxscaled.c
index 268b33b52..ebd67636d 100644
--- a/server/modules/protocol/maxscaled.c
+++ b/server/modules/protocol/maxscaled.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c
index 2772e8e7b..6020a6b87 100644
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@@ -13,7 +13,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
  */
 
 #include "mysql_client_server_protocol.h"
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 42958fc2d..09a2fd7f3 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index b1bd5481d..f8c5d5778 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -13,7 +13,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
  */
 
 /*
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index aeb6607c4..bd7765734 100644
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/modules/routing/GaleraHACRoute.c b/server/modules/routing/GaleraHACRoute.c
index 33a9597cc..2c0773f2b 100644
--- a/server/modules/routing/GaleraHACRoute.c
+++ b/server/modules/routing/GaleraHACRoute.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
index d92f03c10..5f83eb5f0 100644
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/binlog/blr_cache.c b/server/modules/routing/binlog/blr_cache.c
index 5bc46f036..a7213aa8a 100644
--- a/server/modules/routing/binlog/blr_cache.c
+++ b/server/modules/routing/binlog/blr_cache.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/binlog/blr_file.c b/server/modules/routing/binlog/blr_file.c
index 7a44033fe..74aacdc99 100644
--- a/server/modules/routing/binlog/blr_file.c
+++ b/server/modules/routing/binlog/blr_file.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c
index ee14cec4c..684b80a0b 100644
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
index 5d7a16475..878c5e157 100644
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/cli.c b/server/modules/routing/cli.c
index ac525f695..eb581f4c7 100644
--- a/server/modules/routing/cli.c
+++ b/server/modules/routing/cli.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/debugcli.c b/server/modules/routing/debugcli.c
index aa0e82ef8..9dfe69a05 100644
--- a/server/modules/routing/debugcli.c
+++ b/server/modules/routing/debugcli.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c
index f238e16e6..2a05dece7 100644
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index 68e2dfcef..07f6ccb24 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -13,7 +13,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
  */
 
 /**
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index c602d8913..d3877d326 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <strings.h>
diff --git a/server/modules/routing/testroute.c b/server/modules/routing/testroute.c
index ce2ce2ca9..494b2cd69 100644
--- a/server/modules/routing/testroute.c
+++ b/server/modules/routing/testroute.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <router.h>
diff --git a/server/modules/routing/webserver.c b/server/modules/routing/webserver.c
index 28102dfd4..af00a4e7b 100644
--- a/server/modules/routing/webserver.c
+++ b/server/modules/routing/webserver.c
@@ -13,7 +13,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
  */
 #include <stdio.h>
 #include <router.h>
diff --git a/table_replication_consistency/table_replication_consistency.h b/table_replication_consistency/table_replication_consistency.h
index 92a423818..d97881740 100644
--- a/table_replication_consistency/table_replication_consistency.h
+++ b/table_replication_consistency/table_replication_consistency.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, SkySQL Ab
+Copyright (C) 2013, MariaDB Corporation Ab
 
 
 This file is distributed as part of the SkySQL Gateway. It is free
diff --git a/table_replication_consistency/table_replication_listener.h b/table_replication_consistency/table_replication_listener.h
index c207a37d0..373ad612f 100644
--- a/table_replication_consistency/table_replication_listener.h
+++ b/table_replication_consistency/table_replication_listener.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, SkySQL Ab
+Copyright (C) 2013, MariaDB Corporation Ab
 
 
 This file is distributed as part of the SkySQL Gateway. It is free
diff --git a/table_replication_consistency/table_replication_metadata.h b/table_replication_consistency/table_replication_metadata.h
index 78436714f..b1cc5e7e8 100644
--- a/table_replication_consistency/table_replication_metadata.h
+++ b/table_replication_consistency/table_replication_metadata.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, SkySQL Ab
+Copyright (C) 2013, MariaDB Corporation Ab
 
 
 This file is distributed as part of the SkySQL Gateway. It is free
diff --git a/table_replication_consistency/table_replication_parser.h b/table_replication_consistency/table_replication_parser.h
index 0b13a6438..c3889c6dd 100644
--- a/table_replication_consistency/table_replication_parser.h
+++ b/table_replication_consistency/table_replication_parser.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, SkySQL Ab
+Copyright (C) 2013, MariaDB Corporation Ab
 
 
 This file is distributed as part of the SkySQL Gateway. It is free
diff --git a/utils/skygw_debug.h b/utils/skygw_debug.h
index acc59bc85..5dadbc16e 100644
--- a/utils/skygw_debug.h
+++ b/utils/skygw_debug.h
@@ -13,7 +13,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
  */
 
 #include <stdio.h>
diff --git a/utils/skygw_types.h b/utils/skygw_types.h
index a82db80ab..aebb5332c 100644
--- a/utils/skygw_types.h
+++ b/utils/skygw_types.h
@@ -13,7 +13,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
  */
 #if !defined(SKYGW_TYPES_H)
 #define SKYGW_TYPES_H
diff --git a/utils/skygw_utils.cc b/utils/skygw_utils.cc
index 4845c73a2..64633d957 100644
--- a/utils/skygw_utils.cc
+++ b/utils/skygw_utils.cc
@@ -13,7 +13,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
  */
 
 

From f4e591e382c4d184b5c8cf82164faf3acd918225 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Tue, 30 Sep 2014 13:15:03 +0300
Subject: [PATCH 07/25] Changed 'SkySQL Gateway' to 'MariaDB Corporation
 MaxScale'

---
 log_manager/log_manager.cc                                    | 4 ++--
 log_manager/log_manager.h                                     | 2 +-
 log_manager/test/testlog.c                                    | 2 +-
 log_manager/test/testorder.c                                  | 2 +-
 query_classifier/query_classifier.cc                          | 2 +-
 query_classifier/query_classifier.h                           | 2 +-
 query_classifier/test/canonical_tests/canonizer.c             | 2 +-
 query_classifier/test/testmain.c                              | 2 +-
 replication_listener/gtid.h                                   | 2 +-
 replication_listener/listener_exception.h                     | 2 +-
 server/core/adminusers.c                                      | 2 +-
 server/core/atomic.c                                          | 2 +-
 server/core/buffer.c                                          | 2 +-
 server/core/config.c                                          | 2 +-
 server/core/dbusers.c                                         | 2 +-
 server/core/dcb.c                                             | 2 +-
 server/core/gateway.c                                         | 4 ++--
 server/core/gw_utils.c                                        | 2 +-
 server/core/gwbitmask.c                                       | 2 +-
 server/core/hashtable.c                                       | 2 +-
 server/core/housekeeper.c                                     | 2 +-
 server/core/load_utils.c                                      | 2 +-
 server/core/maxkeys.c                                         | 2 +-
 server/core/maxpasswd.c                                       | 2 +-
 server/core/monitor.c                                         | 2 +-
 server/core/poll.c                                            | 2 +-
 server/core/secrets.c                                         | 2 +-
 server/core/server.c                                          | 2 +-
 server/core/service.c                                         | 2 +-
 server/core/session.c                                         | 2 +-
 server/core/spinlock.c                                        | 4 ++--
 server/core/test/test_mysql_users.c                           | 2 +-
 server/core/thread.c                                          | 2 +-
 server/core/users.c                                           | 2 +-
 server/core/utils.c                                           | 2 +-
 server/include/adminusers.h                                   | 2 +-
 server/include/atomic.h                                       | 2 +-
 server/include/buffer.h                                       | 2 +-
 server/include/config.h                                       | 2 +-
 server/include/dbusers.h                                      | 2 +-
 server/include/dcb.h                                          | 2 +-
 server/include/filter.h                                       | 2 +-
 server/include/gwbitmask.h                                    | 2 +-
 server/include/hashtable.h                                    | 2 +-
 server/include/housekeeper.h                                  | 2 +-
 server/include/maxscale.h                                     | 2 +-
 server/include/modules.h                                      | 2 +-
 server/include/monitor.h                                      | 2 +-
 server/include/poll.h                                         | 2 +-
 server/include/rdtsc.h                                        | 2 +-
 server/include/router.h                                       | 2 +-
 server/include/secrets.h                                      | 2 +-
 server/include/server.h                                       | 2 +-
 server/include/service.h                                      | 2 +-
 server/include/session.h                                      | 2 +-
 server/include/spinlock.h                                     | 2 +-
 server/include/thread.h                                       | 2 +-
 server/include/users.h                                        | 2 +-
 server/modules/include/debugcli.h                             | 2 +-
 server/modules/include/httpd.h                                | 2 +-
 server/modules/include/mysql_client_server_protocol.h         | 2 +-
 server/modules/include/mysqlhint.h                            | 2 +-
 server/modules/include/readconnection.h                       | 2 +-
 server/modules/include/readwritesplit.h                       | 2 +-
 server/modules/include/telnetd.h                              | 2 +-
 server/modules/monitor/galera_mon.c                           | 2 +-
 server/modules/monitor/mysql_mon.c                            | 2 +-
 server/modules/monitor/mysqlmon.h                             | 2 +-
 server/modules/monitor/ndbcluster_mon.c                       | 2 +-
 server/modules/protocol/httpd.c                               | 2 +-
 server/modules/protocol/mysql_backend.c                       | 2 +-
 server/modules/protocol/mysql_client.c                        | 2 +-
 server/modules/protocol/mysql_common.c                        | 2 +-
 server/modules/protocol/telnetd.c                             | 2 +-
 server/modules/routing/debugcli.c                             | 2 +-
 server/modules/routing/debugcmd.c                             | 2 +-
 server/modules/routing/readconnroute.c                        | 2 +-
 server/modules/routing/readwritesplit/readwritesplit.c        | 2 +-
 server/modules/routing/testroute.c                            | 2 +-
 table_replication_consistency/table_replication_consistency.h | 2 +-
 table_replication_consistency/table_replication_listener.h    | 2 +-
 table_replication_consistency/table_replication_metadata.h    | 2 +-
 table_replication_consistency/table_replication_parser.h      | 2 +-
 utils/skygw_debug.h                                           | 2 +-
 utils/skygw_types.h                                           | 2 +-
 utils/skygw_utils.cc                                          | 2 +-
 86 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 5a4f7d973..24288e986 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -404,7 +404,7 @@ return_succp:
 
 
 /** 
- * @node Initializes log managing routines in SkySQL Gateway.
+ * @node Initializes log managing routines in MariaDB Corporation MaxScale.
  *
  * Parameters:
  * @param p_ctx - in, give
diff --git a/log_manager/log_manager.h b/log_manager/log_manager.h
index 121897be4..4c42905d7 100644
--- a/log_manager/log_manager.h
+++ b/log_manager/log_manager.h
@@ -1,5 +1,5 @@
 /*
- * 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/log_manager/test/testlog.c b/log_manager/test/testlog.c
index 9b6539444..c82442173 100644
--- a/log_manager/test/testlog.c
+++ b/log_manager/test/testlog.c
@@ -1,5 +1,5 @@
 /*
- * 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/log_manager/test/testorder.c b/log_manager/test/testorder.c
index 043d39758..dd598cb75 100644
--- a/log_manager/test/testorder.c
+++ b/log_manager/test/testorder.c
@@ -1,5 +1,5 @@
 /*
- * 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/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index 3a14bc7cb..2b9f2c5c2 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -1,7 +1,7 @@
 /**
  * @section LICENCE
  * 
- * This file is distributed as part of the SkySQL Gateway. It is
+ * 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/query_classifier/query_classifier.h b/query_classifier/query_classifier.h
index 6ade74f7a..95e9694f6 100644
--- a/query_classifier/query_classifier.h
+++ b/query_classifier/query_classifier.h
@@ -1,5 +1,5 @@
 /*
-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/query_classifier/test/canonical_tests/canonizer.c b/query_classifier/test/canonical_tests/canonizer.c
index b9b17222f..7e33fe4a1 100644
--- a/query_classifier/test/canonical_tests/canonizer.c
+++ b/query_classifier/test/canonical_tests/canonizer.c
@@ -7,7 +7,7 @@
 #include <mysql.h>
 
 static char* server_options[] = {
-        "SkySQL Gateway",
+        "MariaDB Corporation MaxScale",
 	"--datadir=./",
 	"--language=./",
 	"--skip-innodb",
diff --git a/query_classifier/test/testmain.c b/query_classifier/test/testmain.c
index 00000de98..08a25d4fa 100644
--- a/query_classifier/test/testmain.c
+++ b/query_classifier/test/testmain.c
@@ -13,7 +13,7 @@ static char datadir[1024] = "";
 static char mysqldir[1024] = "";
 
 static char* server_options[] = {
-        "SkySQL Gateway",
+        "MariaDB Corporation MaxScale",
         "--datadir=",
         "--default-storage-engine=myisam",
         NULL
diff --git a/replication_listener/gtid.h b/replication_listener/gtid.h
index 620955e68..a0308b623 100644
--- a/replication_listener/gtid.h
+++ b/replication_listener/gtid.h
@@ -1,7 +1,7 @@
 /*
 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/listener_exception.h b/replication_listener/listener_exception.h
index 94fb44fff..2ed663c56 100644
--- a/replication_listener/listener_exception.h
+++ b/replication_listener/listener_exception.h
@@ -2,7 +2,7 @@
 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/server/core/adminusers.c b/server/core/adminusers.c
index e7c118f53..3d86bd83b 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/atomic.c b/server/core/atomic.c
index 8730b27c6..5d3b99c46 100644
--- a/server/core/atomic.c
+++ b/server/core/atomic.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/buffer.c b/server/core/buffer.c
index 4ca0f4fd1..0f284c6b2 100644
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/config.c b/server/core/config.c
index 9c8c5f628..d32b1e317 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/dbusers.c b/server/core/dbusers.c
index 78601a0f9..5b0b9c77a 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/dcb.c b/server/core/dcb.c
index 9d89133aa..d4333e9bc 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/gateway.c b/server/core/gateway.c
index cfa1ca78e..2b70d66c2 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -88,7 +88,7 @@ extern int lm_enabled_logfiles_bitmask;
  * is not fixed here and will be updated elsewhere.
  */
 static char* server_options[] = {
-    "SkySQL Gateway",
+    "MariaDB Corporation MaxScale",
     "--no-defaults",
     "--datadir=",
     "--language=",
diff --git a/server/core/gw_utils.c b/server/core/gw_utils.c
index d1e23eb7f..39c5e1542 100644
--- a/server/core/gw_utils.c
+++ b/server/core/gw_utils.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/gwbitmask.c b/server/core/gwbitmask.c
index 92958e26e..3a959c9f4 100644
--- a/server/core/gwbitmask.c
+++ b/server/core/gwbitmask.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/hashtable.c b/server/core/hashtable.c
index 41c0b53c5..523048330 100644
--- a/server/core/hashtable.c
+++ b/server/core/hashtable.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/housekeeper.c b/server/core/housekeeper.c
index eae08d8e8..50556b0c6 100644
--- a/server/core/housekeeper.c
+++ b/server/core/housekeeper.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/load_utils.c b/server/core/load_utils.c
index 67330b10b..3756f2485 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/maxkeys.c b/server/core/maxkeys.c
index 66a5d0145..c731aaaf9 100644
--- a/server/core/maxkeys.c
+++ b/server/core/maxkeys.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/maxpasswd.c b/server/core/maxpasswd.c
index ab3986b62..89fab40ef 100644
--- a/server/core/maxpasswd.c
+++ b/server/core/maxpasswd.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/monitor.c b/server/core/monitor.c
index 9a41379f2..07fc047eb 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/poll.c b/server/core/poll.c
index 678016068..d6f309c77 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/secrets.c b/server/core/secrets.c
index 768323370..fa6ff3244 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/server.c b/server/core/server.c
index 1dcf8f6aa..3520d2918 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/service.c b/server/core/service.c
index f6b74a92d..933da8d5e 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/session.c b/server/core/session.c
index 573f1e619..a2f1e0178 100644
--- a/server/core/session.c
+++ b/server/core/session.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/spinlock.c b/server/core/spinlock.c
index eeb1c8733..b37c628e4 100644
--- a/server/core/spinlock.c
+++ b/server/core/spinlock.c
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -17,7 +17,7 @@
  */
 
 /**
- * @file spinlock.c  -  Spinlock operations for the SkySQL Gateway
+ * @file spinlock.c  -  Spinlock operations for the MariaDB Corporation MaxScale
  *
  * @verbatim
  * Revision History
diff --git a/server/core/test/test_mysql_users.c b/server/core/test/test_mysql_users.c
index 7b01d23f6..15ef96c23 100644
--- a/server/core/test/test_mysql_users.c
+++ b/server/core/test/test_mysql_users.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/thread.c b/server/core/thread.c
index 187cf884d..84b0325ce 100644
--- a/server/core/thread.c
+++ b/server/core/thread.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/users.c b/server/core/users.c
index 16600ed62..f77083454 100644
--- a/server/core/users.c
+++ b/server/core/users.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/core/utils.c b/server/core/utils.c
index 09cefe277..f31731942 100644
--- a/server/core/utils.c
+++ b/server/core/utils.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/include/adminusers.h b/server/include/adminusers.h
index fefe456c6..6c44079ab 100644
--- a/server/include/adminusers.h
+++ b/server/include/adminusers.h
@@ -1,7 +1,7 @@
 #ifndef _ADMINUSERS_H
 #define _ADMINUSERS_H
 /*
- * 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/server/include/atomic.h b/server/include/atomic.h
index 2b9b21435..07223319d 100644
--- a/server/include/atomic.h
+++ b/server/include/atomic.h
@@ -1,7 +1,7 @@
 #ifndef _ATOMIC_H
 #define _ATOMIC_H
 /*
- * 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/server/include/buffer.h b/server/include/buffer.h
index c60a2db8c..ef7c945b1 100644
--- a/server/include/buffer.h
+++ b/server/include/buffer.h
@@ -1,7 +1,7 @@
 #ifndef _BUFFER_H
 #define _BUFFER_H
 /*
- * 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/server/include/config.h b/server/include/config.h
index 6ee7acdd1..13e515d9e 100644
--- a/server/include/config.h
+++ b/server/include/config.h
@@ -1,7 +1,7 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 /*
- * 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/server/include/dbusers.h b/server/include/dbusers.h
index 99f4a2c79..511beefd8 100644
--- a/server/include/dbusers.h
+++ b/server/include/dbusers.h
@@ -1,7 +1,7 @@
 #ifndef _DBUSERS_H
 #define _DBUSERS_H
 /*
- * 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/server/include/dcb.h b/server/include/dcb.h
index bc3b1d019..e6604a758 100644
--- a/server/include/dcb.h
+++ b/server/include/dcb.h
@@ -1,7 +1,7 @@
 #ifndef _DCB_H
 #define _DCB_H
 /*
- * 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/server/include/filter.h b/server/include/filter.h
index d40b5f53b..ad0b9a21a 100644
--- a/server/include/filter.h
+++ b/server/include/filter.h
@@ -1,7 +1,7 @@
 #ifndef _FILTER_H
 #define _FILTER_H
 /*
- * 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/server/include/gwbitmask.h b/server/include/gwbitmask.h
index 74cf7b7ec..5e987d53c 100644
--- a/server/include/gwbitmask.h
+++ b/server/include/gwbitmask.h
@@ -1,7 +1,7 @@
 #ifndef _GWBITMASK_H
 #define _GWBITMASK_H
 /*
- * 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/server/include/hashtable.h b/server/include/hashtable.h
index 2b9cd5c75..78b6b4032 100644
--- a/server/include/hashtable.h
+++ b/server/include/hashtable.h
@@ -1,7 +1,7 @@
 #ifndef _HASTABLE_H
 #define _HASTABLE_H
 /*
- * 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/server/include/housekeeper.h b/server/include/housekeeper.h
index ec30f8fe4..14523747d 100644
--- a/server/include/housekeeper.h
+++ b/server/include/housekeeper.h
@@ -1,7 +1,7 @@
 #ifndef _HOUSEKEEPER_H
 #define _HOUSEKEEPER_H
 /*
- * 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/server/include/maxscale.h b/server/include/maxscale.h
index 3294b2b35..521c42dd9 100644
--- a/server/include/maxscale.h
+++ b/server/include/maxscale.h
@@ -1,7 +1,7 @@
 #ifndef _MAXSCALE_H
 #define _MAXSCALE_H
 /*
- * 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/server/include/modules.h b/server/include/modules.h
index 256a721e6..abdb5725a 100644
--- a/server/include/modules.h
+++ b/server/include/modules.h
@@ -1,7 +1,7 @@
 #ifndef _MODULES_H
 #define _MODULES_H
 /*
- * 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/server/include/monitor.h b/server/include/monitor.h
index 209ab443e..7fb22eb9a 100644
--- a/server/include/monitor.h
+++ b/server/include/monitor.h
@@ -1,7 +1,7 @@
 #ifndef _MONITOR_H
 #define _MONITOR_H
 /*
- * 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/server/include/poll.h b/server/include/poll.h
index 354eae33a..31ff02e50 100644
--- a/server/include/poll.h
+++ b/server/include/poll.h
@@ -1,7 +1,7 @@
 #ifndef _POLL_H
 #define _POLL_H
 /*
- * 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/server/include/rdtsc.h b/server/include/rdtsc.h
index 27fe49006..b221417b7 100644
--- a/server/include/rdtsc.h
+++ b/server/include/rdtsc.h
@@ -1,7 +1,7 @@
 #ifndef _RDTSC_H
 #define _RDTSC_H
 /*
- * 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/server/include/router.h b/server/include/router.h
index 272010143..92bdeeda2 100644
--- a/server/include/router.h
+++ b/server/include/router.h
@@ -1,7 +1,7 @@
 #ifndef _ROUTER_H
 #define _ROUTER_H
 /*
- * 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/server/include/secrets.h b/server/include/secrets.h
index f82602d85..b37bde164 100644
--- a/server/include/secrets.h
+++ b/server/include/secrets.h
@@ -1,7 +1,7 @@
 #ifndef _SECRETS_H
 #define _SECRETS_H
 /*
- * 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/server/include/server.h b/server/include/server.h
index a6f80acf2..34ce7f8b9 100644
--- a/server/include/server.h
+++ b/server/include/server.h
@@ -1,7 +1,7 @@
 #ifndef _SERVER_H
 #define _SERVER_H
 /*
- * 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/server/include/service.h b/server/include/service.h
index bac7fd139..b5a4c8acb 100644
--- a/server/include/service.h
+++ b/server/include/service.h
@@ -1,7 +1,7 @@
 #ifndef _SERVICE_H
 #define _SERVICE_H
 /*
- * 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/server/include/session.h b/server/include/session.h
index 773f75575..e12d48618 100644
--- a/server/include/session.h
+++ b/server/include/session.h
@@ -1,7 +1,7 @@
 #ifndef _SESSION_H
 #define _SESSION_H
 /*
- * 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/server/include/spinlock.h b/server/include/spinlock.h
index f863fcabb..bbab314f6 100644
--- a/server/include/spinlock.h
+++ b/server/include/spinlock.h
@@ -1,7 +1,7 @@
 #ifndef _SPINLOCK_H
 #define _SPINLOCK_H
 /*
- * 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/server/include/thread.h b/server/include/thread.h
index 33c3aaa5c..9cc3eee88 100644
--- a/server/include/thread.h
+++ b/server/include/thread.h
@@ -1,7 +1,7 @@
 #ifndef _THREAD_H
 #define _THREAD_H
 /*
- * 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/server/include/users.h b/server/include/users.h
index 9364f19b9..c86813e31 100644
--- a/server/include/users.h
+++ b/server/include/users.h
@@ -1,7 +1,7 @@
 #ifndef _USERS_H
 #define _USERS_H
 /*
- * 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/server/modules/include/debugcli.h b/server/modules/include/debugcli.h
index 66ef1412c..fa8a3df27 100644
--- a/server/modules/include/debugcli.h
+++ b/server/modules/include/debugcli.h
@@ -1,7 +1,7 @@
 #ifndef _DEBUGCLI_H
 #define _DEBUGCLI_H
 /*
- * 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/server/modules/include/httpd.h b/server/modules/include/httpd.h
index ff1ac7dc3..ba1989ec4 100644
--- a/server/modules/include/httpd.h
+++ b/server/modules/include/httpd.h
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/include/mysql_client_server_protocol.h b/server/modules/include/mysql_client_server_protocol.h
index 942339ce0..3df4712d9 100644
--- a/server/modules/include/mysql_client_server_protocol.h
+++ b/server/modules/include/mysql_client_server_protocol.h
@@ -1,7 +1,7 @@
 #ifndef _MYSQL_PROTOCOL_H
 #define _MYSQL_PROTOCOL_H
 /*
- * 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/server/modules/include/mysqlhint.h b/server/modules/include/mysqlhint.h
index 45f12b2cf..f61ebf366 100644
--- a/server/modules/include/mysqlhint.h
+++ b/server/modules/include/mysqlhint.h
@@ -1,7 +1,7 @@
 #ifndef _MYSQLHINT_H
 #define _MYSQLHINT_H
 /*
- * 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/server/modules/include/readconnection.h b/server/modules/include/readconnection.h
index adbfc6958..d6468114d 100644
--- a/server/modules/include/readconnection.h
+++ b/server/modules/include/readconnection.h
@@ -1,7 +1,7 @@
 #ifndef _READCONNECTION_H
 #define _READCONNECTION_H
 /*
- * 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/server/modules/include/readwritesplit.h b/server/modules/include/readwritesplit.h
index 703173b58..6754efaa9 100644
--- a/server/modules/include/readwritesplit.h
+++ b/server/modules/include/readwritesplit.h
@@ -1,7 +1,7 @@
 #ifndef _RWSPLITROUTER_H
 #define _RWSPLITROUTER_H
 /*
- * 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/server/modules/include/telnetd.h b/server/modules/include/telnetd.h
index bce4ddfe6..ce95716c5 100644
--- a/server/modules/include/telnetd.h
+++ b/server/modules/include/telnetd.h
@@ -1,7 +1,7 @@
 #ifndef _TELNETD_H
 #define _TELNETD_H
 /*
- * 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/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index 0e94b47ac..162d91b30 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 8de7309d1..5abfdf68e 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index 2373c4125..69ba160fd 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -1,7 +1,7 @@
 #ifndef _MYSQLMON_H
 #define _MYSQLMON_H
 /*
- * 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/server/modules/monitor/ndbcluster_mon.c b/server/modules/monitor/ndbcluster_mon.c
index 0b69c605b..56b038246 100644
--- a/server/modules/monitor/ndbcluster_mon.c
+++ b/server/modules/monitor/ndbcluster_mon.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/protocol/httpd.c b/server/modules/protocol/httpd.c
index 0e7c2903c..0715b5b94 100644
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c
index 6020a6b87..9865174a8 100644
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 09a2fd7f3..a31c6473c 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index f8c5d5778..1b2719cb1 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index bd7765734..908ead8b5 100644
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/routing/debugcli.c b/server/modules/routing/debugcli.c
index 9dfe69a05..66f5d8f1f 100644
--- a/server/modules/routing/debugcli.c
+++ b/server/modules/routing/debugcli.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c
index 2a05dece7..070c37ef3 100644
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index 07f6ccb24..bc2d5633a 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index d3877d326..6c9200de7 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -1,5 +1,5 @@
 /*
- * 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/server/modules/routing/testroute.c b/server/modules/routing/testroute.c
index 494b2cd69..ad6b2ca96 100644
--- a/server/modules/routing/testroute.c
+++ b/server/modules/routing/testroute.c
@@ -1,5 +1,5 @@
 /*
- * 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.h b/table_replication_consistency/table_replication_consistency.h
index d97881740..b7a79af27 100644
--- a/table_replication_consistency/table_replication_consistency.h
+++ b/table_replication_consistency/table_replication_consistency.h
@@ -2,7 +2,7 @@
 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_listener.h b/table_replication_consistency/table_replication_listener.h
index 373ad612f..1fd43dea9 100644
--- a/table_replication_consistency/table_replication_listener.h
+++ b/table_replication_consistency/table_replication_listener.h
@@ -2,7 +2,7 @@
 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.h b/table_replication_consistency/table_replication_metadata.h
index b1cc5e7e8..36f2979ab 100644
--- a/table_replication_consistency/table_replication_metadata.h
+++ b/table_replication_consistency/table_replication_metadata.h
@@ -2,7 +2,7 @@
 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.h b/table_replication_consistency/table_replication_parser.h
index c3889c6dd..8baa624d6 100644
--- a/table_replication_consistency/table_replication_parser.h
+++ b/table_replication_consistency/table_replication_parser.h
@@ -2,7 +2,7 @@
 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/utils/skygw_debug.h b/utils/skygw_debug.h
index 5dadbc16e..56b399710 100644
--- a/utils/skygw_debug.h
+++ b/utils/skygw_debug.h
@@ -1,5 +1,5 @@
 /*
- * 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/utils/skygw_types.h b/utils/skygw_types.h
index aebb5332c..9d586e042 100644
--- a/utils/skygw_types.h
+++ b/utils/skygw_types.h
@@ -1,5 +1,5 @@
 /*
- * 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/utils/skygw_utils.cc b/utils/skygw_utils.cc
index 64633d957..0975b6a10 100644
--- a/utils/skygw_utils.cc
+++ b/utils/skygw_utils.cc
@@ -1,5 +1,5 @@
 /*
- * 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.

From ca7ae0bb643d6939df8c153c0ffc15dfe52c51b4 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Tue, 30 Sep 2014 16:31:30 +0300
Subject: [PATCH 08/25] Fix to bug #557,
 http://bugs.mariadb.com/show_bug.cgi?id=557 query_classifier.cc: added
 function for printing combined query type from a bit field.
 query_classifier.h: identify query types SHOW DATABASE, and SHOW TABLES to
 make log entries more understandable. mysql_common.c: moved some trace log
 commands to debug log. readwritesplit.c: moved some trace logs to debug log,
 added trace log commands to gather routing, query type and session
 information to one log entry. skygw_debug.h: added string macros for several
 query and hint types.

---
 query_classifier/query_classifier.cc          |  58 ++++++-
 query_classifier/query_classifier.h           |   5 +-
 server/modules/protocol/mysql_common.c        |  16 +-
 .../routing/readwritesplit/readwritesplit.c   | 162 +++++++++++++-----
 utils/skygw_debug.h                           |  38 +++-
 5 files changed, 222 insertions(+), 57 deletions(-)

diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index ecf305308..bbb314f1e 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -639,7 +639,17 @@ static skygw_query_type_t resolve_query_type(
                         type |= QUERY_TYPE_PREPARE_NAMED_STMT;
                         goto return_qtype;
                         break;
-                        
+
+		case SQLCOM_SHOW_DATABASES:
+			type |= QUERY_TYPE_SHOW_DATABASES;
+			goto return_qtype;
+			break;
+			
+		case SQLCOM_SHOW_TABLES:
+			type |= QUERY_TYPE_SHOW_TABLES;
+			goto return_qtype;
+			break;
+			
                 default:
                         break;
         }
@@ -1375,3 +1385,49 @@ static void parsing_info_set_plain_str(
         
         pi->pi_query_plain_str = str;
 }
+
+/**
+ * Generate a string of query type value.
+ * Caller must free the memory of the resulting string.
+ * 
+ * @param	qtype	Query type value, combination of values listed in 
+ * 			query_classifier.h
+ * 
+ * @return	string representing the query type value
+ */
+char* skygw_get_qtype_str(
+	skygw_query_type_t qtype)
+{
+	int                t1 = (int)qtype;
+	int                t2 = 1;
+	skygw_query_type_t t = QUERY_TYPE_UNKNOWN;
+	char*              qtype_str = NULL;
+
+	/**
+	 * Test values (bits) and clear matching bits from t1 one by one until 
+	 * t1 is completely cleared.
+	 */
+	while (t1 != 0)
+	{		
+		if (t1&t2)
+		{
+			t = (skygw_query_type_t)t2;
+
+			if (qtype_str == NULL)
+			{
+				qtype_str = strdup(STRQTYPE(t));
+			}
+			else
+			{
+				size_t len = strlen(STRQTYPE(t));
+				/** reallocate space for delimiter, new string and termination */
+				qtype_str = (char *)realloc(qtype_str, strlen(qtype_str)+1+len+1);
+				snprintf(qtype_str+strlen(qtype_str), 1+len+1, "|%s", STRQTYPE(t));
+			}
+			/** Remove found value from t1 */
+			t1 &= ~t2;
+		}
+		t2 <<= 1;
+	}
+	return qtype_str;
+}
diff --git a/query_classifier/query_classifier.h b/query_classifier/query_classifier.h
index 4ad960524..e1c764525 100644
--- a/query_classifier/query_classifier.h
+++ b/query_classifier/query_classifier.h
@@ -54,7 +54,9 @@ typedef enum {
     QUERY_TYPE_PREPARE_STMT       = 0x020000,  /*< Prepared stmt with id provided by server:all */
     QUERY_TYPE_EXEC_STMT          = 0x040000,  /*< Execute prepared statement:master or any */
     QUERY_TYPE_CREATE_TMP_TABLE   = 0x080000,  /*< Create temporary table:master (could be all) */
-    QUERY_TYPE_READ_TMP_TABLE     = 0x100000  /*< Read temporary table:master (could be any) */
+    QUERY_TYPE_READ_TMP_TABLE     = 0x100000,  /*< Read temporary table:master (could be any) */
+    QUERY_TYPE_SHOW_DATABASES	  = 0x200000,  /*< Show list of databases */
+    QUERY_TYPE_SHOW_TABLES        = 0x400000   /*< Show list of tables */
 } skygw_query_type_t;
 
 
@@ -91,6 +93,7 @@ bool            parse_query (GWBUF* querybuf);
 parsing_info_t* parsing_info_init(void (*donefun)(void *));
 void            parsing_info_done(void* ptr);
 bool            query_is_parsed(GWBUF* buf);
+char*           skygw_get_qtype_str(skygw_query_type_t qtype);
 
 
 EXTERN_C_BLOCK_END
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index b1bd5481d..5f02b6af8 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -1653,9 +1653,11 @@ void protocol_archive_srv_command(
         
         s1 = &p->protocol_command;
         
-        LOGIF(LT, (skygw_log_write(
-                LOGFILE_TRACE,
-                "Move command %s from fd %d to command history.",
+        LOGIF(LD, (skygw_log_write(
+                LOGFILE_DEBUG,
+                "%lu [protocol_archive_srv_command] Move command %s from fd %d "
+		"to command history.",
+		pthread_self(),
                 STRPACKETTYPE(s1->scom_cmd), 
                 p->owner_dcb->fd)));
         
@@ -1727,8 +1729,8 @@ void protocol_add_srv_command(
                 p->protocol_command.scom_next = server_command_init(NULL, cmd);
         }
         
-        LOGIF(LT, (skygw_log_write(
-                LOGFILE_TRACE,
+        LOGIF(LD, (skygw_log_write(
+                LOGFILE_DEBUG,
                 "Added command %s to fd %d.",
                 STRPACKETTYPE(cmd),
                 p->owner_dcb->fd)));
@@ -1738,8 +1740,8 @@ void protocol_add_srv_command(
 
         while (c != NULL && c->scom_cmd != MYSQL_COM_UNDEFINED)
         {
-                LOGIF(LT, (skygw_log_write(
-                        LOGFILE_TRACE,
+                LOGIF(LD, (skygw_log_write(
+                        LOGFILE_DEBUG,
                         "fd %d : %d %s",
                         p->owner_dcb->fd,
                         c->scom_cmd,
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index c602d8913..740e9ce67 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -1282,9 +1282,10 @@ static route_target_t get_route_target (
 			if (hint->type == HINT_ROUTE_TO_MASTER)
 			{
 				target = TARGET_MASTER; /*< override */
-				LOGIF(LT, (skygw_log_write(
-					LOGFILE_TRACE,
-			       "Hint: route to master.")));
+				LOGIF(LD, (skygw_log_write(
+					LOGFILE_DEBUG,
+					"%lu [get_route_target] Hint: route to master.",
+					pthread_self())));
 				break;
 			}
 			else if (hint->type == HINT_ROUTE_TO_NAMED_SERVER)
@@ -1294,9 +1295,11 @@ static route_target_t get_route_target (
 				 * found, the oroginal target is chosen.
 				 */
 				target |= TARGET_NAMED_SERVER;
-				LOGIF(LT, (skygw_log_write(
-					LOGFILE_TRACE,
-			       "Hint: route to named server : ")));
+				LOGIF(LD, (skygw_log_write(
+					LOGFILE_DEBUG,
+					"%lu [get_route_target] Hint: route to "
+					"named server : ",
+					pthread_self())));
 			}
 			else if (hint->type == HINT_ROUTE_TO_UPTODATE_SERVER)
 			{
@@ -1334,9 +1337,11 @@ static route_target_t get_route_target (
 			else if (hint->type == HINT_ROUTE_TO_SLAVE)
 			{
 				target = TARGET_SLAVE;
-				LOGIF(LT, (skygw_log_write(
-					LOGFILE_TRACE,
-			       "Hint: route to slave.")));                                
+				LOGIF(LD, (skygw_log_write(
+					LOGFILE_DEBUG,
+					"%lu [get_route_target] Hint: route to "
+					"slave.",
+					pthread_self())));                                
 			}
 			hint = hint->next;
 		} /*< while (hint != NULL) */
@@ -1653,7 +1658,6 @@ static int routeQuery(
         GWBUF*  querybuf)
 {
         skygw_query_type_t qtype          = QUERY_TYPE_UNKNOWN;
-        char*              querystr       = NULL;
         mysql_server_cmd_t packet_type;
         uint8_t*           packet;
         int                ret            = 0;
@@ -1793,8 +1797,33 @@ static int routeQuery(
         {
                 router_cli_ses->rses_autocommit_enabled = true;
                 router_cli_ses->rses_transaction_active = false;
-        }        
+	}        
 
+	if (LOG_IS_ENABLED(LOGFILE_TRACE))
+	{
+		uint8_t*      packet = GWBUF_DATA(querybuf);
+		unsigned char ptype = packet[4];
+		size_t        len = MIN(GWBUF_LENGTH(querybuf), 
+					 MYSQL_GET_PACKET_LEN((unsigned char *)querybuf->start)-1);
+		char*         data = (char*)&packet[5];
+		char*         contentstr = strndup(data, len);
+		char*         qtypestr = skygw_get_qtype_str(qtype);
+
+		LOGIF(LT, (skygw_log_write(
+			LOGFILE_TRACE,
+			"> Autocommit: %s, trx is %s, cmd: %s, type: %s, "
+			"stmt: %s%s %s",
+			(router_cli_ses->rses_autocommit_enabled ? "[enabled]" : "[disabled]"),
+			(router_cli_ses->rses_transaction_active ? "[open]" : "[not open]"),
+			STRPACKETTYPE(ptype),
+			(qtypestr==NULL ? "N/A" : qtypestr),
+			contentstr,
+			(querybuf->hint == NULL ? "" : ", Hint:"),
+			(querybuf->hint == NULL ? "" : STRHINTTYPE(querybuf->hint->type)))));		
+
+		free(contentstr);
+		free(qtypestr);
+	}
         /** 
          * Find out where to route the query. Result may not be clear; it is 
          * possible to have a hint for routing to a named server which can
@@ -1911,6 +1940,27 @@ static int routeQuery(
 				btype, 
 				named_server,
 				rlag_max);
+		if (!succp)
+		{
+			if (TARGET_IS_NAMED_SERVER(route_target))
+			{
+				LOGIF(LT, (skygw_log_write(
+					LOGFILE_TRACE,
+					"Was supposed to route to named server "
+					"%s but couldn't find the server in a "
+					"suitable state.",
+					named_server)));
+			}
+			else if (TARGET_IS_RLAG_MAX(route_target))
+			{
+				LOGIF(LT, (skygw_log_write(
+					LOGFILE_TRACE,
+					"Was supposed to route to server with "
+					"replication lag at most %d but couldn't "
+					"find such a slave.",
+					rlag_max)));
+			}
+		}
 	}
 	
 	if (!succp && TARGET_IS_SLAVE(route_target))
@@ -1930,9 +1980,16 @@ static int routeQuery(
 				NULL,
 				rlag_max);
 		if (succp)
-		{
+		{			
 			atomic_add(&inst->stats.n_slave, 1);			
 		}
+		else
+		{
+			LOGIF(LT, (skygw_log_write(LOGFILE_TRACE,
+						   "Was supposed to route to slave"
+						   "but finding suitable one "
+						   "failed.")));
+		}
 	}
 	
 	if (!succp && TARGET_IS_MASTER(route_target))
@@ -1944,6 +2001,16 @@ static int routeQuery(
 					BE_MASTER, 
 					NULL,
 					MAX_RLAG_UNDEFINED);
+			if (!succp)
+			{
+				LOGIF(LT, (skygw_log_write(LOGFILE_TRACE,
+							   "Was supposed to "
+							   "route to master "
+							   "but couldn't find "
+							   "master in a "
+							   "suitable state "
+							   "failed.")));
+			}
 		}
 		else
 		{
@@ -1951,9 +2018,7 @@ static int routeQuery(
 		}
 		atomic_add(&inst->stats.n_master, 1);
 		target_dcb = master_dcb;
-	}
-	ss_dassert(succp);
-	
+	}	
 	
 	if (succp) /*< Have DCB of the target backend */
 	{
@@ -1962,6 +2027,14 @@ static int routeQuery(
 		
 		bref = get_bref_from_dcb(router_cli_ses, target_dcb);
 		scur = &bref->bref_sescmd_cur;
+
+		LOGIF(LT, (skygw_log_write(
+			LOGFILE_TRACE,
+			"Route query to %s\t%s:%d <",
+			(SERVER_IS_MASTER(bref->bref_backend->backend_server) ? 
+				"master" : "slave"),
+			bref->bref_backend->backend_server->name,
+			bref->bref_backend->backend_server->port)));
 		/** 
 		 * Store current stmt if execution of previous session command 
 		 * haven't completed yet. Note that according to MySQL protocol
@@ -1993,8 +2066,7 @@ static int routeQuery(
 		{
 			LOGIF(LE, (skygw_log_write_flush(
 				LOGFILE_ERROR,
-				"Error : Routing query \"%s\" failed.",
-				querystr)));
+				"Error : Routing query failed.")));
 		}
 	}
 	rses_end_locked_router_action(router_cli_ses);
@@ -3441,12 +3513,6 @@ static bool execute_sescmd_in_backend(
                                 sescmd_cursor_clone_querybuf(scur));
                         break;
         }
-        LOGIF(LT, (skygw_log_write_flush(
-                LOGFILE_TRACE,
-                "%lu [execute_sescmd_in_backend] Routed %s cmd %p.",
-                pthread_self(),
-                STRPACKETTYPE(scur->scmd_cur_cmd->my_sescmd_packet_type),
-                scur->scmd_cur_cmd)));
 
         if (rc == 1)
         {
@@ -3573,8 +3639,8 @@ static void tracelog_routed_query(
                         querystr = (char *)malloc(len);
                         memcpy(querystr, startpos, len-1);
                         querystr[len-1] = '\0';
-                        LOGIF(LT, (skygw_log_write_flush(
-                                LOGFILE_TRACE,
+                        LOGIF(LD, (skygw_log_write_flush(
+                                LOGFILE_DEBUG,
                                 "%lu [%s] %d bytes long buf, \"%s\" -> %s:%d %s dcb %p",
                                 pthread_self(),
                                 funcname,
@@ -3595,8 +3661,8 @@ static void tracelog_routed_query(
                         querystr = (char *)malloc(len);
                         memcpy(querystr, startpos, len-1);
                         querystr[len-1] = '\0';
-                        LOGIF(LT, (skygw_log_write_flush(
-                                LOGFILE_TRACE,
+                        LOGIF(LD, (skygw_log_write_flush(
+                                LOGFILE_DEBUG,
                                 "%lu [%s] %d bytes long buf, \"%s\" -> %s:%d %s dcb %p",
                                 pthread_self(),
                                 funcname,
@@ -3663,10 +3729,7 @@ static bool route_session_write(
   
         LOGIF(LT, (skygw_log_write(
                 LOGFILE_TRACE,
-                "Session write, query type\t%s, packet type %s, "
-                "routing to all servers.",
-                STRQTYPE(qtype),
-                STRPACKETTYPE(packet_type))));
+                "Session write, routing to all servers.")));
 
         backend_ref = router_cli_ses->rses_backend_ref;
         
@@ -3693,7 +3756,19 @@ static bool route_session_write(
                                 
                 for (i=0; i<router_cli_ses->rses_nbackends; i++)
                 {
-                        DCB* dcb = backend_ref[i].bref_dcb;                        
+                        DCB* dcb = backend_ref[i].bref_dcb;     
+			
+			if (LOG_IS_ENABLED(LOGFILE_TRACE))
+			{
+				LOGIF(LT, (skygw_log_write(
+					LOGFILE_TRACE,
+					"Route query to %s\t%s:%d%s",
+					(SERVER_IS_MASTER(backend_ref[i].bref_backend->backend_server) ? 
+						"master" : "slave"),
+					backend_ref[i].bref_backend->backend_server->name,
+					backend_ref[i].bref_backend->backend_server->port,
+					(i+1==router_cli_ses->rses_nbackends ? " <" : ""))));
+			}
 
                         if (BREF_IS_IN_USE((&backend_ref[i])))
                         {
@@ -3703,14 +3778,7 @@ static bool route_session_write(
                                 {
                                         succp = false;
                                 }
-                                else if (LOG_IS_ENABLED(LOGFILE_TRACE))
-				{
-					LOGIF(LT, (skygw_log_write(
-						LOGFILE_TRACE,
-						"Wrote to %s:%d",
-						backend_ref[i].bref_backend->backend_server->name,
-						backend_ref[i].bref_backend->backend_server->port)));
-				}					
+
                         }
                 }
                 rses_end_locked_router_action(router_cli_ses);
@@ -3740,6 +3808,18 @@ static bool route_session_write(
                 {
                         sescmd_cursor_t* scur;
                         
+			if (LOG_IS_ENABLED(LOGFILE_TRACE))
+			{
+				LOGIF(LT, (skygw_log_write(
+					LOGFILE_TRACE,
+					"Route query to %s\t%s:%d%s",
+					(SERVER_IS_MASTER(backend_ref[i].bref_backend->backend_server) ? 
+					"master" : "slave"),
+					backend_ref[i].bref_backend->backend_server->name,
+					backend_ref[i].bref_backend->backend_server->port,
+					(i+1==router_cli_ses->rses_nbackends ? " <" : ""))));
+			}
+			
                         scur = backend_ref_get_sescmd_cursor(&backend_ref[i]);
                         
                         /** 
@@ -3747,7 +3827,7 @@ static bool route_session_write(
                          */
                         bref_set_state(get_bref_from_dcb(router_cli_ses, 
                                                          backend_ref[i].bref_dcb), 
-                                       BREF_WAITING_RESULT);
+							BREF_WAITING_RESULT);
                         /** 
                          * Start execution if cursor is not already executing.
                          * Otherwise, cursor will execute pending commands
diff --git a/utils/skygw_debug.h b/utils/skygw_debug.h
index acc59bc85..a537644f4 100644
--- a/utils/skygw_debug.h
+++ b/utils/skygw_debug.h
@@ -129,13 +129,29 @@ typedef enum skygw_chk_t {
 
 # define STRBOOL(b) ((b) ? "true" : "false")
 
-# define STRQTYPE(t) ((t) == QUERY_TYPE_WRITE ? "QUERY_TYPE_WRITE" :    \
-                      ((t) == QUERY_TYPE_READ ? "QUERY_TYPE_READ" :     \
-                       ((t) == QUERY_TYPE_SESSION_WRITE ? "QUERY_TYPE_SESSION_WRITE" : \
-                        ((t) == QUERY_TYPE_UNKNOWN ? "QUERY_TYPE_UNKNOWN" : \
-                         ((t) == QUERY_TYPE_LOCAL_READ ? "QUERY_TYPE_LOCAL_READ" : \
-                          ((t) == QUERY_TYPE_EXEC_STMT ? "QUERY_TYPE_EXEC_STMT" : \
-                          "Unknown query type"))))))
+# define STRQTYPE(t)	((t) == QUERY_TYPE_WRITE ? "QUERY_TYPE_WRITE" :    		\
+			((t) == QUERY_TYPE_READ ? "QUERY_TYPE_READ" :     		\
+			((t) == QUERY_TYPE_SESSION_WRITE ? "QUERY_TYPE_SESSION_WRITE" :	\
+                        ((t) == QUERY_TYPE_UNKNOWN ? "QUERY_TYPE_UNKNOWN" : 		\
+                        ((t) == QUERY_TYPE_LOCAL_READ ? "QUERY_TYPE_LOCAL_READ" :	\
+                        ((t) == QUERY_TYPE_MASTER_READ ? "QUERY_TYPE_MASTER_READ" :	\
+                        ((t) == QUERY_TYPE_USERVAR_READ ? "QUERY_TYPE_USERVAR_READ" :	\
+                        ((t) == QUERY_TYPE_SYSVAR_READ ? "QUERY_TYPE_SYSVAR_READ" :	\
+                        ((t) == QUERY_TYPE_GSYSVAR_READ ? "QUERY_TYPE_GSYSVAR_READ" :	\
+                        ((t) == QUERY_TYPE_GSYSVAR_WRITE ? "QUERY_TYPE_GSYSVAR_WRITE" :	\
+                        ((t) == QUERY_TYPE_BEGIN_TRX ? "QUERY_TYPE_BEGIN_TRX" :		\
+                        ((t) == QUERY_TYPE_ENABLE_AUTOCOMMIT ? "QUERY_TYPE_ENABLE_AUTOCOMMIT" :		\
+                        ((t) == QUERY_TYPE_DISABLE_AUTOCOMMIT ? "QUERY_TYPE_DISABLE_AUTOCOMMIT" : 	\
+                        ((t) == QUERY_TYPE_ROLLBACK ? "QUERY_TYPE_ROLLBACK" : 		\
+                        ((t) == QUERY_TYPE_COMMIT ? "QUERY_TYPE_COMMIT" : 		\
+                        ((t) == QUERY_TYPE_PREPARE_NAMED_STMT ? "QUERY_TYPE_PREPARE_NAMED_STMT" :	\
+                        ((t) == QUERY_TYPE_PREPARE_STMT ? "QUERY_TYPE_PREPARE_STMT" :	\
+                        ((t) == QUERY_TYPE_EXEC_STMT ? "QUERY_TYPE_EXEC_STMT" :		\
+                        ((t) == QUERY_TYPE_CREATE_TMP_TABLE ? "QUERY_TYPE_CREATE_TMP_TABLE" :		\
+                        ((t) == QUERY_TYPE_READ_TMP_TABLE ? "QUERY_TYPE_READ_TMP_TABLE" :		\
+                        ((t) == QUERY_TYPE_SHOW_DATABASES ? "QUERY_TYPE_SHOW_DATABASES" :		\
+                        ((t) == QUERY_TYPE_SHOW_TABLES ? "QUERY_TYPE_SHOW_TABLES" :	\
+                        "Unknown query type"))))))))))))))))))))))
 
 #define STRLOGID(i) ((i) == LOGFILE_TRACE ? "LOGFILE_TRACE" :           \
                 ((i) == LOGFILE_MESSAGE ? "LOGFILE_MESSAGE" :           \
@@ -247,6 +263,14 @@ typedef enum skygw_chk_t {
                         (SERVER_IS_RELAY_SERVER(s) ? "RUNNING RELAY" : \
                         (SERVER_IS_RUNNING(s) ? "RUNNING (only)" : "NO STATUS")))))))
 
+#define STRHINTTYPE(t)	(t == HINT_ROUTE_TO_MASTER ? "HINT_ROUTE_TO_MASTER" :	\
+			((t) == HINT_ROUTE_TO_SLAVE ? "HINT_ROUTE_TO_SLAVE" :	\
+			((t) == HINT_ROUTE_TO_NAMED_SERVER ? "HINT_ROUTE_TO_NAMED_SERVER" :		\
+			((t) == HINT_ROUTE_TO_UPTODATE_SERVER ? "HINT_ROUTE_TO_UPTODATE_SERVER" :	\
+			((t) == HINT_ROUTE_TO_ALL ? "HINT_ROUTE_TO_ALL" : 	\
+			((t) == HINT_PARAMETER ? "HINT_PARAMETER" : "UNKNOWN HINT TYPE"))))))
+                        
+                        
 #define CHK_MLIST(l) {                                                  \
             ss_info_dassert((l->mlist_chk_top ==  CHK_NUM_MLIST &&      \
                              l->mlist_chk_tail == CHK_NUM_MLIST),       \

From c055a3c0d28b8c0f8638de201ea99ac900151b35 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Tue, 30 Sep 2014 17:04:43 +0300
Subject: [PATCH 09/25] Addition to fix of #557, Removal of confusing and
 erroneous log message.

---
 query_classifier/query_classifier.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index bbb314f1e..d10a7d9d3 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -833,8 +833,7 @@ static skygw_query_type_t resolve_query_type(
                                         LOGIF(LD, (skygw_log_write(
                                                 LOGFILE_DEBUG,
                                                 "%lu [resolve_query_type] "
-                                                "Unknown functype %d. Something "
-                                                "has gone wrong.",
+                                                "Functype %d.",
                                                 pthread_self(),
                                                 ftype)));
                                         break;

From cbc5b4614c6514d35a2ab1594558e8d75ec21006 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Wed, 1 Oct 2014 05:52:17 +0300
Subject: [PATCH 10/25] Added a note about using the unpacking script into the
 README.

---
 README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README b/README
index c1ea8b066..69ecea0bb 100644
--- a/README
+++ b/README
@@ -59,6 +59,10 @@ to the --relocate option.
 
 	rpm -i --force --relocate=/usr/=$PREFIX/usr/ MariaDB-5.5.34-centos6-x86_64-common.rpm MariaDB-5.5.34-centos6-x86_64-compat.rpm MariaDB-5.5.34-centos6-x86_64-devel.rpm
 
+You can also use the included 'unpack_rpm.sh' script to unpack the RPMs without installing them.
+
+	./unpack_rpm <location of MariaDB RPMs> <extraction destination>
+
 This README assumes $PREFIX = $HOME.
 
 MaxScale may be built with the embedded MariaDB library either linked

From bff2d794e0ac9f5cdf5b2ae888d715302f0adce6 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Wed, 1 Oct 2014 13:29:26 +0300
Subject: [PATCH 11/25] Removed unnecessary linking commands to libmysqld.a

---
 query_classifier/CMakeLists.txt                      | 3 +--
 server/modules/monitor/CMakeLists.txt                | 8 ++++----
 server/modules/routing/readwritesplit/CMakeLists.txt | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/query_classifier/CMakeLists.txt b/query_classifier/CMakeLists.txt
index 8f8ab0186..42270cd2c 100644
--- a/query_classifier/CMakeLists.txt
+++ b/query_classifier/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_library(query_classifier SHARED query_classifier.cc)
-target_link_libraries(query_classifier ${EMBEDDED_LIB})
 install(TARGETS query_classifier DESTINATION lib)
 if(BUILD_TESTS)
   add_subdirectory(test)
-endif()
\ No newline at end of file
+endif()
diff --git a/server/modules/monitor/CMakeLists.txt b/server/modules/monitor/CMakeLists.txt
index d94312682..ac765e98d 100644
--- a/server/modules/monitor/CMakeLists.txt
+++ b/server/modules/monitor/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_library(mysqlmon SHARED mysql_mon.c)
-target_link_libraries(mysqlmon log_manager utils ${EMBEDDED_LIB})
+target_link_libraries(mysqlmon log_manager utils)
 install(TARGETS mysqlmon DESTINATION modules)
 
 add_library(galeramon SHARED galera_mon.c)
-target_link_libraries(galeramon log_manager utils ${EMBEDDED_LIB})
+target_link_libraries(galeramon log_manager utils)
 install(TARGETS galeramon DESTINATION modules)
 
 add_library(ndbclustermon SHARED ndbcluster_mon.c)
-target_link_libraries(ndbclustermon log_manager utils ${EMBEDDED_LIB})
-install(TARGETS ndbclustermon DESTINATION modules)
\ No newline at end of file
+target_link_libraries(ndbclustermon log_manager utils)
+install(TARGETS ndbclustermon DESTINATION modules)
diff --git a/server/modules/routing/readwritesplit/CMakeLists.txt b/server/modules/routing/readwritesplit/CMakeLists.txt
index 2821ca3ed..6960d4c8d 100644
--- a/server/modules/routing/readwritesplit/CMakeLists.txt
+++ b/server/modules/routing/readwritesplit/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(readwritesplit SHARED readwritesplit.c)
-target_link_libraries(readwritesplit ssl pthread log_manager utils query_classifier ${EMBEDDED_LIB})
+target_link_libraries(readwritesplit ssl pthread log_manager utils query_classifier)
 install(TARGETS readwritesplit DESTINATION modules)
 if(BUILD_TESTS)
 add_subdirectory(test)
-endif()
\ No newline at end of file
+endif()

From 0acb8fe05d9f03e873723f43be2de0e8f126dad4 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Wed, 1 Oct 2014 13:48:00 +0300
Subject: [PATCH 12/25] 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));

From b38324acb6de3e667b8697059cb7b2423c154188 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Wed, 1 Oct 2014 14:12:26 +0300
Subject: [PATCH 13/25] Fix to bug #514,
 http://bugs.mariadb.com/show_bug.cgi?id=514 Excluded unused functions from
 build with #if defined(NOT_USED) .. #endif macros

---
 utils/skygw_utils.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/skygw_utils.cc b/utils/skygw_utils.cc
index 30b7ae8a9..0144d4519 100644
--- a/utils/skygw_utils.cc
+++ b/utils/skygw_utils.cc
@@ -119,15 +119,16 @@ static void slist_add_node(
         slist_t*      list,
         slist_node_t* node);
 
+#if defined(NOT_USED)
 static slist_node_t* slist_node_get_next(
         slist_node_t* curr_node);
 
 static slist_node_t* slist_get_first(
         slist_t* list);
-
 static slist_cursor_t* slist_get_cursor(
         slist_t* list);
-
+#endif /*< NOT_USED */
+        
 static bool file_write_header(skygw_file_t* file);
 static void simple_mutex_free_memory(simple_mutex_t* sm);
 static void mlist_free_memory(mlist_t* ml, char* name);
@@ -740,7 +741,7 @@ static void slist_add_node(
 }
 
 
-
+#if defined(NOT_USED)
 static slist_node_t* slist_node_get_next(
         slist_node_t* curr_node)
 {
@@ -766,7 +767,6 @@ static slist_node_t* slist_get_first(
         return NULL;
 }
 
-
 static slist_cursor_t* slist_get_cursor(
         slist_t* list)
 {
@@ -777,7 +777,7 @@ static slist_cursor_t* slist_get_cursor(
         c = slist_cursor_init(list);
         return c;
 }
-
+#endif /*< NOT_USED */
 
 static slist_cursor_t* slist_cursor_init(
         slist_t* list)

From a53e80e14499d929ed6e6f4351dc57eef45e3851 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Wed, 1 Oct 2014 14:30:59 +0300
Subject: [PATCH 14/25] Added back removal of double newline character from log
 records.

---
 log_manager/log_manager.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 9dc2a0f87..9c7bbc327 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -755,7 +755,12 @@ static int logmanager_write_log(
                                 break;
                         }
                 }
-                wp[safe_str_len-1] = '\n';
+                /** remove double line feed */
+		if (wp[safe_str_len-2] == '\n') 
+		{
+			wp[safe_str_len-2]=' ';
+		}		
+		wp[safe_str_len-1] = '\n';
                 blockbuf_unregister(bb);
 
                 /**

From b0683d9b4df148b7b7cd4e78228319e0a8b6b6ad Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Wed, 1 Oct 2014 14:37:12 +0300
Subject: [PATCH 15/25] Updated the licensing year from 2013 to 2013-2014

---
 log_manager/log_manager.cc                                    | 2 +-
 log_manager/log_manager.h                                     | 2 +-
 log_manager/test/testlog.c                                    | 2 +-
 log_manager/test/testorder.c                                  | 2 +-
 replication_listener/access_method_factory.h                  | 2 +-
 replication_listener/basic_content_handler.h                  | 2 +-
 replication_listener/binlog_api.h                             | 2 +-
 replication_listener/binlog_driver.h                          | 2 +-
 replication_listener/binlog_event.h                           | 2 +-
 replication_listener/gtid.h                                   | 2 +-
 replication_listener/listener_exception.h                     | 2 +-
 replication_listener/tcp_driver.h                             | 2 +-
 server/core/adminusers.c                                      | 2 +-
 server/core/atomic.c                                          | 2 +-
 server/core/buffer.c                                          | 2 +-
 server/core/config.c                                          | 2 +-
 server/core/dbusers.c                                         | 2 +-
 server/core/dcb.c                                             | 2 +-
 server/core/gateway.c                                         | 4 ++--
 server/core/gw_utils.c                                        | 2 +-
 server/core/gwbitmask.c                                       | 2 +-
 server/core/hashtable.c                                       | 2 +-
 server/core/load_utils.c                                      | 2 +-
 server/core/maxkeys.c                                         | 2 +-
 server/core/maxpasswd.c                                       | 2 +-
 server/core/monitor.c                                         | 2 +-
 server/core/poll.c                                            | 2 +-
 server/core/secrets.c                                         | 2 +-
 server/core/server.c                                          | 2 +-
 server/core/service.c                                         | 2 +-
 server/core/session.c                                         | 2 +-
 server/core/spinlock.c                                        | 2 +-
 server/core/test/test_mysql_users.c                           | 2 +-
 server/core/thread.c                                          | 2 +-
 server/core/users.c                                           | 2 +-
 server/core/utils.c                                           | 2 +-
 server/include/adminusers.h                                   | 2 +-
 server/include/atomic.h                                       | 2 +-
 server/include/buffer.h                                       | 2 +-
 server/include/config.h                                       | 2 +-
 server/include/dbusers.h                                      | 2 +-
 server/include/dcb.h                                          | 2 +-
 server/include/gwbitmask.h                                    | 2 +-
 server/include/hashtable.h                                    | 2 +-
 server/include/modules.h                                      | 2 +-
 server/include/monitor.h                                      | 2 +-
 server/include/poll.h                                         | 2 +-
 server/include/router.h                                       | 2 +-
 server/include/secrets.h                                      | 2 +-
 server/include/server.h                                       | 2 +-
 server/include/service.h                                      | 2 +-
 server/include/session.h                                      | 2 +-
 server/include/spinlock.h                                     | 2 +-
 server/include/thread.h                                       | 2 +-
 server/include/users.h                                        | 2 +-
 server/modules/include/debugcli.h                             | 2 +-
 server/modules/include/httpd.h                                | 2 +-
 server/modules/include/mysql_client_server_protocol.h         | 2 +-
 server/modules/include/mysqlhint.h                            | 2 +-
 server/modules/include/readconnection.h                       | 2 +-
 server/modules/include/readwritesplit.h                       | 2 +-
 server/modules/include/telnetd.h                              | 2 +-
 server/modules/monitor/galera_mon.c                           | 2 +-
 server/modules/monitor/mysql_mon.c                            | 2 +-
 server/modules/monitor/mysqlmon.h                             | 2 +-
 server/modules/monitor/ndbcluster_mon.c                       | 2 +-
 server/modules/protocol/httpd.c                               | 2 +-
 server/modules/protocol/mysql_backend.c                       | 2 +-
 server/modules/protocol/mysql_client.c                        | 2 +-
 server/modules/protocol/mysql_common.c                        | 2 +-
 server/modules/protocol/telnetd.c                             | 2 +-
 server/modules/routing/GaleraHACRoute.c                       | 2 +-
 server/modules/routing/debugcli.c                             | 2 +-
 server/modules/routing/debugcmd.c                             | 2 +-
 server/modules/routing/readconnroute.c                        | 2 +-
 server/modules/routing/readwritesplit/readwritesplit.c        | 2 +-
 server/modules/routing/testroute.c                            | 2 +-
 table_replication_consistency/table_replication_consistency.h | 2 +-
 table_replication_consistency/table_replication_listener.h    | 2 +-
 table_replication_consistency/table_replication_metadata.h    | 2 +-
 table_replication_consistency/table_replication_parser.h      | 2 +-
 utils/skygw_debug.h                                           | 2 +-
 utils/skygw_types.h                                           | 2 +-
 utils/skygw_utils.cc                                          | 2 +-
 84 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 9dc2a0f87..d1be9f310 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/log_manager/log_manager.h b/log_manager/log_manager.h
index 4c42905d7..c6d207702 100644
--- a/log_manager/log_manager.h
+++ b/log_manager/log_manager.h
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 
diff --git a/log_manager/test/testlog.c b/log_manager/test/testlog.c
index c82442173..797af4d07 100644
--- a/log_manager/test/testlog.c
+++ b/log_manager/test/testlog.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 
diff --git a/log_manager/test/testorder.c b/log_manager/test/testorder.c
index dd598cb75..4dbad0833 100644
--- a/log_manager/test/testorder.c
+++ b/log_manager/test/testorder.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 #include <unistd.h>
diff --git a/replication_listener/access_method_factory.h b/replication_listener/access_method_factory.h
index 670129159..e402a1185 100644
--- a/replication_listener/access_method_factory.h
+++ b/replication_listener/access_method_factory.h
@@ -1,7 +1,7 @@
 /*
 Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights
 reserved.
-Copyright (c) 2013, MariaDB Corporation Ab
+Copyright (c) 2013-2014, MariaDB Corporation Ab
 
 Portions of this file contain modifications contributed and copyrighted by
 MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described
diff --git a/replication_listener/basic_content_handler.h b/replication_listener/basic_content_handler.h
index 6966f4887..5debfb672 100644
--- a/replication_listener/basic_content_handler.h
+++ b/replication_listener/basic_content_handler.h
@@ -1,7 +1,7 @@
 /*
 Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights
 reserved.
-Copyright (c) 2013, MariaDB Corporation Ab
+Copyright (c) 2013-2014, MariaDB Corporation Ab
 
 Portions of this file contain modifications contributed and copyrighted by
 MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described
diff --git a/replication_listener/binlog_api.h b/replication_listener/binlog_api.h
index 22ad60180..fb6e24f77 100644
--- a/replication_listener/binlog_api.h
+++ b/replication_listener/binlog_api.h
@@ -1,7 +1,7 @@
 /*
 Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights
 reserved.
-Copyright (c) 2013, MariaDB Corporation Ab
+Copyright (c) 2013-2014, MariaDB Corporation Ab
 
 Portions of this file contain modifications contributed and copyrighted by
 MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described
diff --git a/replication_listener/binlog_driver.h b/replication_listener/binlog_driver.h
index f04d12cf5..73e60587d 100644
--- a/replication_listener/binlog_driver.h
+++ b/replication_listener/binlog_driver.h
@@ -1,7 +1,7 @@
 /*
 Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights
 reserved.
-Copyright (c) 2013, MariaDB Corporation Ab
+Copyright (c) 2013-2014, MariaDB Corporation Ab
 
 Portions of this file contain modifications contributed and copyrighted by
 MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described
diff --git a/replication_listener/binlog_event.h b/replication_listener/binlog_event.h
index e4afbad58..3c8285044 100644
--- a/replication_listener/binlog_event.h
+++ b/replication_listener/binlog_event.h
@@ -1,7 +1,7 @@
 /*
 Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights
 reserved.
-Copyright (c) 2013, MariaDB Corporation Ab
+Copyright (c) 2013-2014, MariaDB Corporation Ab
 
 Portions of this file contain modifications contributed and copyrighted by
 MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described
diff --git a/replication_listener/gtid.h b/replication_listener/gtid.h
index a0308b623..359ae9d04 100644
--- a/replication_listener/gtid.h
+++ b/replication_listener/gtid.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, MariaDB Corporation Ab
+Copyright (C) 2013-2014, MariaDB Corporation Ab
 
 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
diff --git a/replication_listener/listener_exception.h b/replication_listener/listener_exception.h
index 2ed663c56..7ff656ea8 100644
--- a/replication_listener/listener_exception.h
+++ b/replication_listener/listener_exception.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, MariaDB Corporation Ab
+Copyright (C) 2013-2014, MariaDB Corporation Ab
 
 
 This file is distributed as part of the MariaDB Corporation MaxScale. It is free
diff --git a/replication_listener/tcp_driver.h b/replication_listener/tcp_driver.h
index 64d27342c..7d4d96c94 100644
--- a/replication_listener/tcp_driver.h
+++ b/replication_listener/tcp_driver.h
@@ -1,7 +1,7 @@
 /*
 Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights
 reserved.
-Copyright (c) 2013, MariaDB Corporation Ab
+Copyright (c) 2013-2014, MariaDB Corporation Ab
 
 Portions of this file contain modifications contributed and copyrighted by
 MariaDB Corporation, Ab. Those modifications are gratefully acknowledged and are described
diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 3d86bd83b..e547a1ff5 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/atomic.c b/server/core/atomic.c
index 5d3b99c46..b14e1ccb1 100644
--- a/server/core/atomic.c
+++ b/server/core/atomic.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/buffer.c b/server/core/buffer.c
index c31373d5d..5dc3b0ec7 100644
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/config.c b/server/core/config.c
index d32b1e317..0255f8c2c 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 5b0b9c77a..c65aafdc9 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/dcb.c b/server/core/dcb.c
index d4333e9bc..e624a4526 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/gateway.c b/server/core/gateway.c
index 6c06ae9b5..f3724e87d 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * 
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  * 
  */
 
@@ -1539,7 +1539,7 @@ int main(int argc, char **argv)
         }
         LOGIF(LM, (skygw_log_write(
                 LOGFILE_MESSAGE,
-                "MariaDB Corporation 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/gw_utils.c b/server/core/gw_utils.c
index 39c5e1542..e89d72041 100644
--- a/server/core/gw_utils.c
+++ b/server/core/gw_utils.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * 
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  * 
  */
 
diff --git a/server/core/gwbitmask.c b/server/core/gwbitmask.c
index 3a959c9f4..7706f69f3 100644
--- a/server/core/gwbitmask.c
+++ b/server/core/gwbitmask.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/hashtable.c b/server/core/hashtable.c
index 523048330..1aedbebe0 100644
--- a/server/core/hashtable.c
+++ b/server/core/hashtable.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/load_utils.c b/server/core/load_utils.c
index 3756f2485..9e2b36598 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/maxkeys.c b/server/core/maxkeys.c
index c731aaaf9..ad1e28f86 100644
--- a/server/core/maxkeys.c
+++ b/server/core/maxkeys.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/maxpasswd.c b/server/core/maxpasswd.c
index 89fab40ef..8d90a7631 100644
--- a/server/core/maxpasswd.c
+++ b/server/core/maxpasswd.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/monitor.c b/server/core/monitor.c
index 07fc047eb..3fb1cbb6f 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/poll.c b/server/core/poll.c
index d6f309c77..37784176e 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdio.h>
 #include <string.h>
diff --git a/server/core/secrets.c b/server/core/secrets.c
index fa6ff3244..9ea0819a5 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 #include <secrets.h>
diff --git a/server/core/server.c b/server/core/server.c
index 3520d2918..2afe3bd44 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/service.c b/server/core/service.c
index 933da8d5e..040746f42 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/session.c b/server/core/session.c
index a2f1e0178..645ca7019 100644
--- a/server/core/session.c
+++ b/server/core/session.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/spinlock.c b/server/core/spinlock.c
index b37c628e4..614d1249b 100644
--- a/server/core/spinlock.c
+++ b/server/core/spinlock.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/test/test_mysql_users.c b/server/core/test/test_mysql_users.c
index 15ef96c23..7dc789d83 100644
--- a/server/core/test/test_mysql_users.c
+++ b/server/core/test/test_mysql_users.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/core/thread.c b/server/core/thread.c
index 84b0325ce..ac8095b38 100644
--- a/server/core/thread.c
+++ b/server/core/thread.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <thread.h>
 #include <pthread.h>
diff --git a/server/core/users.c b/server/core/users.c
index f77083454..ebd7412a8 100644
--- a/server/core/users.c
+++ b/server/core/users.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/utils.c b/server/core/utils.c
index f31731942..50ce5cd7d 100644
--- a/server/core/utils.c
+++ b/server/core/utils.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * 
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  * 
  */
 
diff --git a/server/include/adminusers.h b/server/include/adminusers.h
index 6c44079ab..4cc560e41 100644
--- a/server/include/adminusers.h
+++ b/server/include/adminusers.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/atomic.h b/server/include/atomic.h
index 07223319d..f139d15d5 100644
--- a/server/include/atomic.h
+++ b/server/include/atomic.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/buffer.h b/server/include/buffer.h
index 5b4490381..c8b9f1418 100644
--- a/server/include/buffer.h
+++ b/server/include/buffer.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/config.h b/server/include/config.h
index 13e515d9e..0582bc50e 100644
--- a/server/include/config.h
+++ b/server/include/config.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <skygw_utils.h>
 
diff --git a/server/include/dbusers.h b/server/include/dbusers.h
index 511beefd8..f9f4a50ab 100644
--- a/server/include/dbusers.h
+++ b/server/include/dbusers.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 #include <service.h>
diff --git a/server/include/dcb.h b/server/include/dcb.h
index e6604a758..3d0e96762 100644
--- a/server/include/dcb.h
+++ b/server/include/dcb.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <spinlock.h>
 #include <buffer.h>
diff --git a/server/include/gwbitmask.h b/server/include/gwbitmask.h
index 5e987d53c..87f1a8b98 100644
--- a/server/include/gwbitmask.h
+++ b/server/include/gwbitmask.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <spinlock.h>
 
diff --git a/server/include/hashtable.h b/server/include/hashtable.h
index 78b6b4032..07c7d0950 100644
--- a/server/include/hashtable.h
+++ b/server/include/hashtable.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/modules.h b/server/include/modules.h
index abdb5725a..904e6cc7a 100644
--- a/server/include/modules.h
+++ b/server/include/modules.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <dcb.h>
 #include <modinfo.h>
diff --git a/server/include/monitor.h b/server/include/monitor.h
index 7fb22eb9a..6123cd614 100644
--- a/server/include/monitor.h
+++ b/server/include/monitor.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <server.h>
 #include <dcb.h>
diff --git a/server/include/poll.h b/server/include/poll.h
index 31ff02e50..0e4fa08c9 100644
--- a/server/include/poll.h
+++ b/server/include/poll.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <dcb.h>
 #include <gwbitmask.h>
diff --git a/server/include/router.h b/server/include/router.h
index 92bdeeda2..c3401c43a 100644
--- a/server/include/router.h
+++ b/server/include/router.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/secrets.h b/server/include/secrets.h
index b37bde164..505e79154 100644
--- a/server/include/secrets.h
+++ b/server/include/secrets.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/server.h b/server/include/server.h
index 34ce7f8b9..b8ca445f0 100644
--- a/server/include/server.h
+++ b/server/include/server.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <dcb.h>
 
diff --git a/server/include/service.h b/server/include/service.h
index b5a4c8acb..28daeb1c6 100644
--- a/server/include/service.h
+++ b/server/include/service.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 #include <time.h>
diff --git a/server/include/session.h b/server/include/session.h
index e12d48618..86de23782 100644
--- a/server/include/session.h
+++ b/server/include/session.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/spinlock.h b/server/include/spinlock.h
index bbab314f6..47677119e 100644
--- a/server/include/spinlock.h
+++ b/server/include/spinlock.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/include/thread.h b/server/include/thread.h
index 9cc3eee88..9d391b9d7 100644
--- a/server/include/thread.h
+++ b/server/include/thread.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <pthread.h>
 
diff --git a/server/include/users.h b/server/include/users.h
index c86813e31..cf0bca17f 100644
--- a/server/include/users.h
+++ b/server/include/users.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <hashtable.h>
 #include <dcb.h>
diff --git a/server/modules/include/debugcli.h b/server/modules/include/debugcli.h
index fa8a3df27..0f01da519 100644
--- a/server/modules/include/debugcli.h
+++ b/server/modules/include/debugcli.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <service.h>
 #include <session.h>
diff --git a/server/modules/include/httpd.h b/server/modules/include/httpd.h
index ba1989ec4..0f9cbb7ad 100644
--- a/server/modules/include/httpd.h
+++ b/server/modules/include/httpd.h
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /*
diff --git a/server/modules/include/mysql_client_server_protocol.h b/server/modules/include/mysql_client_server_protocol.h
index 3df4712d9..15817527e 100644
--- a/server/modules/include/mysql_client_server_protocol.h
+++ b/server/modules/include/mysql_client_server_protocol.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /*
diff --git a/server/modules/include/mysqlhint.h b/server/modules/include/mysqlhint.h
index f61ebf366..f9561c5c0 100644
--- a/server/modules/include/mysqlhint.h
+++ b/server/modules/include/mysqlhint.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /*
diff --git a/server/modules/include/readconnection.h b/server/modules/include/readconnection.h
index d6468114d..45eb2b51d 100644
--- a/server/modules/include/readconnection.h
+++ b/server/modules/include/readconnection.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/include/readwritesplit.h b/server/modules/include/readwritesplit.h
index 6754efaa9..46c3a2b16 100644
--- a/server/modules/include/readwritesplit.h
+++ b/server/modules/include/readwritesplit.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/include/telnetd.h b/server/modules/include/telnetd.h
index ce95716c5..c427c2e8b 100644
--- a/server/modules/include/telnetd.h
+++ b/server/modules/include/telnetd.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index 162d91b30..02a646aa2 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 5abfdf68e..7dd237ac2 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index 69ba160fd..018d695ff 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -15,7 +15,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include	<server.h>
 #include	<spinlock.h>
diff --git a/server/modules/monitor/ndbcluster_mon.c b/server/modules/monitor/ndbcluster_mon.c
index 56b038246..1997f274e 100644
--- a/server/modules/monitor/ndbcluster_mon.c
+++ b/server/modules/monitor/ndbcluster_mon.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/protocol/httpd.c b/server/modules/protocol/httpd.c
index 0715b5b94..5d37ae187 100644
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c
index 9865174a8..12643d953 100644
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 #include "mysql_client_server_protocol.h"
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index a31c6473c..445996196 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index 89ffd890e..af04209e2 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /*
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index 908ead8b5..d89962cd8 100644
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/modules/routing/GaleraHACRoute.c b/server/modules/routing/GaleraHACRoute.c
index dca0c302b..2f2627acb 100644
--- a/server/modules/routing/GaleraHACRoute.c
+++ b/server/modules/routing/GaleraHACRoute.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/routing/debugcli.c b/server/modules/routing/debugcli.c
index ef6faf4dc..2e5a79381 100644
--- a/server/modules/routing/debugcli.c
+++ b/server/modules/routing/debugcli.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c
index 070c37ef3..8f51d531a 100644
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index bc2d5633a..c00a5a0a4 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 /**
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index e08386089..0ad46b0e4 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdio.h>
 #include <strings.h>
diff --git a/server/modules/routing/testroute.c b/server/modules/routing/testroute.c
index ad6b2ca96..47a581c5d 100644
--- a/server/modules/routing/testroute.c
+++ b/server/modules/routing/testroute.c
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <stdio.h>
 #include <router.h>
diff --git a/table_replication_consistency/table_replication_consistency.h b/table_replication_consistency/table_replication_consistency.h
index b7a79af27..0d5faefde 100644
--- a/table_replication_consistency/table_replication_consistency.h
+++ b/table_replication_consistency/table_replication_consistency.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, MariaDB Corporation Ab
+Copyright (C) 2013-2014, MariaDB Corporation Ab
 
 
 This file is distributed as part of the MariaDB Corporation MaxScale. It is free
diff --git a/table_replication_consistency/table_replication_listener.h b/table_replication_consistency/table_replication_listener.h
index 1fd43dea9..2c1b31794 100644
--- a/table_replication_consistency/table_replication_listener.h
+++ b/table_replication_consistency/table_replication_listener.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, MariaDB Corporation Ab
+Copyright (C) 2013-2014, MariaDB Corporation Ab
 
 
 This file is distributed as part of the MariaDB Corporation MaxScale. It is free
diff --git a/table_replication_consistency/table_replication_metadata.h b/table_replication_consistency/table_replication_metadata.h
index 36f2979ab..910d63295 100644
--- a/table_replication_consistency/table_replication_metadata.h
+++ b/table_replication_consistency/table_replication_metadata.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, MariaDB Corporation Ab
+Copyright (C) 2013-2014, MariaDB Corporation Ab
 
 
 This file is distributed as part of the MariaDB Corporation MaxScale. It is free
diff --git a/table_replication_consistency/table_replication_parser.h b/table_replication_consistency/table_replication_parser.h
index 8baa624d6..5a854e2f7 100644
--- a/table_replication_consistency/table_replication_parser.h
+++ b/table_replication_consistency/table_replication_parser.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013, MariaDB Corporation Ab
+Copyright (C) 2013-2014, MariaDB Corporation Ab
 
 
 This file is distributed as part of the MariaDB Corporation MaxScale. It is free
diff --git a/utils/skygw_debug.h b/utils/skygw_debug.h
index 7c070cd6f..0b966ece0 100644
--- a/utils/skygw_debug.h
+++ b/utils/skygw_debug.h
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 #include <stdio.h>
diff --git a/utils/skygw_types.h b/utils/skygw_types.h
index 9d586e042..4410cc23a 100644
--- a/utils/skygw_types.h
+++ b/utils/skygw_types.h
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 #if !defined(SKYGW_TYPES_H)
 #define SKYGW_TYPES_H
diff --git a/utils/skygw_utils.cc b/utils/skygw_utils.cc
index a5776e47f..dbd13cc43 100644
--- a/utils/skygw_utils.cc
+++ b/utils/skygw_utils.cc
@@ -13,7 +13,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013
+ * Copyright MariaDB Corporation Ab 2013-2014
  */
 
 

From 3053775592406b623907d39e73f13e5f7be5af81 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Wed, 1 Oct 2014 14:48:48 +0300
Subject: [PATCH 16/25] Tests aren't built as a default anymore.

---
 macros.cmake               |  2 +-
 server/core/CMakeLists.txt | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/macros.cmake b/macros.cmake
index 7e3e5d250..cc29a5e09 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -51,7 +51,7 @@ macro(set_variables)
   set(INSTALL_SYSTEM_FILES TRUE CACHE BOOL "Install init.d scripts and ldconf configuration files")
 
   # Build tests
-  set(BUILD_TESTS TRUE CACHE BOOL "Build tests")
+  set(BUILD_TESTS FALSE CACHE BOOL "Build tests")
 
 endmacro()
 
diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index 2c7854de3..bddf95239 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -1,11 +1,12 @@
-file(GLOB FULLCORE_SRC *.c)
-add_library(fullcore STATIC ${FULLCORE_SRC})
-target_link_libraries(fullcore log_manager utils pthread ${EMBEDDED_LIB} ssl aio rt crypt dl crypto inih z m stdc++)
-
+if(BUILD_TESTS)
+  file(GLOB FULLCORE_SRC *.c)
+  add_library(fullcore STATIC ${FULLCORE_SRC})
+  target_link_libraries(fullcore log_manager utils pthread ${EMBEDDED_LIB} ssl aio rt crypt dl crypto inih z m stdc++)
+endif()
 add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c
-	gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c 
-	poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c 
-	monitor.c adminusers.c secrets.c filter.c modutil.c hint.c housekeeper.c)
+  gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c 
+  poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c 
+  monitor.c adminusers.c secrets.c filter.c modutil.c hint.c housekeeper.c)
 target_link_libraries(maxscale ${EMBEDDED_LIB} log_manager utils ssl aio pthread crypt dl crypto inih z rt m stdc++)
 install(TARGETS maxscale DESTINATION bin)
 
@@ -18,5 +19,5 @@ target_link_libraries(maxpasswd log_manager utils pthread crypt crypto)
 install(TARGETS maxpasswd DESTINATION bin)
 
 if(BUILD_TESTS)
-add_subdirectory(test)
+  add_subdirectory(test)
 endif()
\ No newline at end of file

From 5fa7e4bf71c17bf4fc19d35cf4b249f3d32cd055 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Wed, 1 Oct 2014 15:08:24 +0300
Subject: [PATCH 17/25] 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.

From c4ca1ddb13e351a4a698676eb0732d9183b2fbc6 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Wed, 1 Oct 2014 15:21:47 +0300
Subject: [PATCH 18/25] 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)

From cd0c17676eb26c7b0df59a0c2f1a57b883261c34 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Wed, 1 Oct 2014 22:17:43 +0300
Subject: [PATCH 19/25] get_decimal_len wasn't declared in C portion of the
 code and the symbol was mangled.

---
 utils/skygw_utils.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/skygw_utils.h b/utils/skygw_utils.h
index 80793fbca..309b9019f 100644
--- a/utils/skygw_utils.h
+++ b/utils/skygw_utils.h
@@ -192,10 +192,11 @@ int skygw_rwlock_unlock(skygw_rwlock_t* rwlock);
 int skygw_rwlock_init(skygw_rwlock_t** rwlock);
 
 int atomic_add(int *variable, int value);
-size_t get_decimal_len(size_t s);
 
 EXTERN_C_BLOCK_BEGIN
 
+size_t get_decimal_len(size_t s);
+
 char* replace_literal(char* haystack, 
                       const char* needle, 
                       const char* replacement);

From bb11f6236f45bb8e16f68ff7a27de6ba5f564396 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Thu, 2 Oct 2014 09:44:30 +0300
Subject: [PATCH 20/25] Related to #145,
 http://bugs.mariadb.com/show_bug.cgi?id=145 If .secrets file is not used it
 means that encrypted password is not used. Moved log entry away from error
 log and placed it to message log. It still prints it multiple times though.

---
 server/core/secrets.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/server/core/secrets.c b/server/core/secrets.c
index 9ea0819a5..c0b82c347 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -74,16 +74,29 @@ int             len;
 	snprintf(secret_file, 255, "%s/etc/.secrets", home);
 
 	/* Try to access secrets file */
-	if (access(secret_file, R_OK) == -1) {
+	if (access(secret_file, R_OK) == -1) 
+	{
                 int eno = errno;
                 errno = 0;
-                LOGIF(LE, (skygw_log_write_flush(
-                        LOGFILE_ERROR,
-                        "Error : access for secrets file "
-                        "[%s] failed. Error %d, %s.",
-                        secret_file,
-                        eno,
-                        strerror(eno))));
+		if (eno == ENOENT)
+		{
+			LOGIF(LM, (skygw_log_write(
+				LOGFILE_MESSAGE,
+				"Encrypted password file %s can't be accessed "
+				"(%s). Password encryption is not used.",
+				secret_file,
+				strerror(eno))));
+		}
+		else
+		{
+			LOGIF(LE, (skygw_log_write_flush(
+				LOGFILE_ERROR,
+				"Error : access for secrets file "
+				"[%s] failed. Error %d, %s.",
+				secret_file,
+				eno,
+				strerror(eno))));
+		}
 		return NULL;
         }
 

From b102d69ef9a7b5310602773b0be2d4ea3032dce0 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Thu, 2 Oct 2014 18:40:25 +0300
Subject: [PATCH 21/25] Fix to bug 562
 (http://bugs.mariadb.com/show_bug.cgi?id=562) mysql_client.c: Changed the
 error message and, in the case of a failed auth while using a password, set
 the first byte to 1 in dcb->data->client_sha1

---
 server/modules/protocol/mysql_client.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index b1559b94b..9ff04221d 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -488,6 +488,10 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
 	if (auth_ret == 0)
 	{
 		dcb->user = strdup(client_data->user);
+	}else if(auth_token_len > 0)
+	{
+		/**User was using a password, add a notification for that*/
+		stage1_hash[0] = 1;
 	}
 
 	return auth_ret;
@@ -654,12 +658,22 @@ int gw_read_client_event(
                                 protocol->owner_dcb->fd,
                                 pthread_self())));
                         
+
+						char errstr [256];
+						MYSQL_session *mysqlsession =  dcb->data;
+
+						sprintf(errstr,
+								"Access denied for user '%s'@'%s' (using password: %s)",
+								mysqlsession->user,
+								dcb->remote,
+								mysqlsession->client_sha1[0] > 0 ? "YES":"NO");
+
                         /** Send ERR 1045 to client */
                         mysql_send_auth_error(
                                 dcb,
                                 2,
                                 0,
-                                "Authorization failed");                        
+                                errstr);
 
                         dcb_close(dcb);
                 }

From c5f0baaa8fff996b62b6c103797b68995d4c6ad4 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Fri, 3 Oct 2014 10:09:15 +0300
Subject: [PATCH 22/25] 'make testall' now correctly kills the test MaxScale
 process.

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e83ee7861..d0d082b3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,6 @@ add_custom_target(testall
   COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
   COMMAND make install
   COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null"
-  COMMAND make test
-  COMMAND /bin/sh -c "killall -KILL maxscale"
-  COMMENT "Running full test suite")
\ No newline at end of file
+  COMMAND /bin/sh -c "make test || echo \"Test results written to: ${CMAKE_BINARY_DIR}/Testing/Temporary/\""
+  COMMAND killall maxscale
+  COMMENT "Running full test suite" VERBATIM)
\ No newline at end of file

From f3c77d6ec973cbaaef3ac63d709a17bb355c5caa Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Fri, 3 Oct 2014 10:16:12 +0300
Subject: [PATCH 23/25] Reverting commit
 b102d69ef9a7b5310602773b0be2d4ea3032dce0 due to the bug being a duplicate and
 the correct fix being different.

---
 server/modules/protocol/mysql_client.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 9ff04221d..b1559b94b 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -488,10 +488,6 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
 	if (auth_ret == 0)
 	{
 		dcb->user = strdup(client_data->user);
-	}else if(auth_token_len > 0)
-	{
-		/**User was using a password, add a notification for that*/
-		stage1_hash[0] = 1;
 	}
 
 	return auth_ret;
@@ -658,22 +654,12 @@ int gw_read_client_event(
                                 protocol->owner_dcb->fd,
                                 pthread_self())));
                         
-
-						char errstr [256];
-						MYSQL_session *mysqlsession =  dcb->data;
-
-						sprintf(errstr,
-								"Access denied for user '%s'@'%s' (using password: %s)",
-								mysqlsession->user,
-								dcb->remote,
-								mysqlsession->client_sha1[0] > 0 ? "YES":"NO");
-
                         /** Send ERR 1045 to client */
                         mysql_send_auth_error(
                                 dcb,
                                 2,
                                 0,
-                                errstr);
+                                "Authorization failed");                        
 
                         dcb_close(dcb);
                 }

From a7fc8cd68aa5de2bedca0f159218264d851e8198 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Fri, 3 Oct 2014 14:29:25 +0300
Subject: [PATCH 24/25] added missing dependencies to RPM and DEB packages.

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0d082b3a..22fad7cf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,7 @@ if(NOT ( ${DEBBUILD} STREQUAL "DEBBUILD-NOTFOUND" ) )
   set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
   execute_process(COMMAND dpgk --print-architecture OUTPUT_VARIABLE DEB_ARCHITECTURE)
   set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE})
+  set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) 
   message(STATUS "Generating DEB packages for ${DEB_ARCHITECTURE}")
 endif()
 
@@ -126,6 +127,7 @@ set(CPACK_RPM_PACKAGE_NAME "maxscale")
 set(CPACK_RPM_PACKAGE_VENDOR "MariaDB Corporation Ab")
 set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
+set(CPACK_RPM_PACKAGE_REQUIRES "libaio, openssl, openssl-libs, glibc, libstdc++, zlib")
 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_SPEC_MORE_DEFINE "%define ignore \#")
 set(CPACK_RPM_USER_FILELIST "%ignore /etc/init.d")

From d227409abce314c809d5f8818b9db251be0d9151 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@skysql.com>
Date: Fri, 3 Oct 2014 15:07:23 +0300
Subject: [PATCH 25/25] re-enabled the automatic detection of dependencies for
 packages.

---
 CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22fad7cf1..e21a14d5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,8 +126,6 @@ set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig")
 set(CPACK_RPM_PACKAGE_NAME "maxscale")
 set(CPACK_RPM_PACKAGE_VENDOR "MariaDB Corporation Ab")
 set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
-set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
-set(CPACK_RPM_PACKAGE_REQUIRES "libaio, openssl, openssl-libs, glibc, libstdc++, zlib")
 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_SPEC_MORE_DEFINE "%define ignore \#")
 set(CPACK_RPM_USER_FILELIST "%ignore /etc/init.d")