diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
commit | d3e2e1243bb0dae95ce35b0380dd4f8f476b254d (patch) | |
tree | 8779ad6b2059f181770cc07e2437925d7d5d5d04 /plugin | |
parent | 229dad1f9b12f8e9f64b6a605bdf8e31c339d018 (diff) | |
parent | 124428a9e28e59f98b25d8ee07b57d264f63cbe4 (diff) | |
download | mariadb-git-d3e2e1243bb0dae95ce35b0380dd4f8f476b254d.tar.gz |
5.5 merge
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/semisync/semisync.cc | 1 | ||||
-rw-r--r-- | plugin/semisync/semisync.h | 1 | ||||
-rw-r--r-- | plugin/semisync/semisync_slave_plugin.cc | 1 | ||||
-rw-r--r-- | plugin/server_audit/server_audit.c | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/plugin/semisync/semisync.cc b/plugin/semisync/semisync.cc index 022773eed0a..4a80360ba4d 100644 --- a/plugin/semisync/semisync.cc +++ b/plugin/semisync/semisync.cc @@ -1,5 +1,6 @@ /* Copyright (C) 2007 Google Inc. Copyright (C) 2008 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugin/semisync/semisync.h b/plugin/semisync/semisync.h index 4208048bacb..0e801428a56 100644 --- a/plugin/semisync/semisync.h +++ b/plugin/semisync/semisync.h @@ -1,5 +1,6 @@ /* Copyright (C) 2007 Google Inc. Copyright (C) 2008 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugin/semisync/semisync_slave_plugin.cc b/plugin/semisync/semisync_slave_plugin.cc index 96e614b845e..b98888ecd32 100644 --- a/plugin/semisync/semisync_slave_plugin.cc +++ b/plugin/semisync/semisync_slave_plugin.cc @@ -1,5 +1,6 @@ /* Copyright (C) 2007 Google Inc. Copyright (C) 2008 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 969714bf16f..0b1ddbde6e4 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -15,7 +15,7 @@ #define PLUGIN_VERSION 0x101 -#define PLUGIN_STR_VERSION "1.1.5" +#define PLUGIN_STR_VERSION "1.1.7" #include <stdio.h> #include <time.h> |