diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 13:16:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 14:33:24 +0200 |
| commit | 587568b72a0f4bcb284b292f158dea6f65c03487 (patch) | |
| tree | e9caae1f20e997ce2bc528fc41d1adbe2c2d8bf0 /include | |
| parent | bcb36ee21e2515d17dcf03b760487e64eb780f2b (diff) | |
| parent | 51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff) | |
| download | mariadb-git-587568b72a0f4bcb284b292f158dea6f65c03487.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 2 | ||||
| -rw-r--r-- | include/sql_common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 7853aa0195a..3c8301eddbf 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 diff --git a/include/sql_common.h b/include/sql_common.h index 39b8ce18517..9c67034d798 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 |