summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-04-24 09:26:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-04-24 09:26:40 +0300
commit9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (patch)
tree1adb4d44b9b7e7cf20e63e3ebc95ba05f7dc47e9 /include/mysql_com.h
parent5b79303b40e31d77f616c2b797f58de41973e6a3 (diff)
parentc7bb33724826dab53831b74bc0cf7ec311eb13f0 (diff)
downloadmariadb-git-9c34a4124d67d9e3f70837eaeb11290f35e8f8d0.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 678ff0b7186..dd55daf77aa 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
- Copyright (c) 2010, 2013, Monty Program Ab
+ Copyright (c) 2010, 2018, MariaDB
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