diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /plugin/server_audit | |
parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
parent | cb248f880619431850e5638009a6098048050edf (diff) | |
download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'plugin/server_audit')
-rw-r--r-- | plugin/server_audit/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugin/server_audit/COPYING | 4 | ||||
-rw-r--r-- | plugin/server_audit/plugin_audit_v4.h | 2 | ||||
-rw-r--r-- | plugin/server_audit/server_audit.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugin/server_audit/CMakeLists.txt b/plugin/server_audit/CMakeLists.txt index 056a11f3753..8a5333cfb9f 100644 --- a/plugin/server_audit/CMakeLists.txt +++ b/plugin/server_audit/CMakeLists.txt @@ -11,7 +11,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 02111-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA SET(SOURCES server_audit.c test_audit_v4.c plugin_audit_v4.h) diff --git a/plugin/server_audit/COPYING b/plugin/server_audit/COPYING index d511905c164..6e475df5526 100644 --- a/plugin/server_audit/COPYING +++ b/plugin/server_audit/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. 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. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. Also add information on how to contact you by electronic and paper mail. diff --git a/plugin/server_audit/plugin_audit_v4.h b/plugin/server_audit/plugin_audit_v4.h index f8662c23e6b..a2a38806f4f 100644 --- a/plugin/server_audit/plugin_audit_v4.h +++ b/plugin/server_audit/plugin_audit_v4.h @@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef _my_audit_h #define _my_audit_h diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 4e8c7ad670e..8472f9749c3 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -11,7 +11,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 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #define PLUGIN_VERSION 0x104 |