diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-04-19 22:27:02 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-19 22:31:26 +0200 |
commit | 1a019d08012db7b3fa6a42d39342792c3418e75b (patch) | |
tree | c116066b995f1c7a2d8c11e72aa9fa547a20407b /include/sql_common.h | |
parent | 5e61e1716e763315009318081fba5994b8910242 (diff) | |
parent | c0b4d74b52e7eec9b13af732193f7f8d7abe05de (diff) | |
download | mariadb-git-1a019d08012db7b3fa6a42d39342792c3418e75b.tar.gz |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'include/sql_common.h')
-rw-r--r-- | include/sql_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index a1c9faac82d..5bfe5ba8969 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -1,7 +1,7 @@ #ifndef SQL_COMMON_INCLUDED #define SQL_COMMON_INCLUDED /* Copyright (c) 2003, 2012, Oracle and/or its affiliates. - Copyright (c) 2010, 2012, 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 |