diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 10:18:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 10:18:17 +0200 |
| commit | df5f25fa7a2c9f43f0506b2ef98dc00033a5c557 (patch) | |
| tree | a817540a283821a9badd4e704ca79b7c57d1d1e0 /sql/sql_partition.h | |
| parent | b036b6b59464524d7dd54a4c9a75b5ee8a14dbe0 (diff) | |
| parent | 1da916c37e5107b27297fc9e22c3da7772bb097d (diff) | |
| download | mariadb-git-df5f25fa7a2c9f43f0506b2ef98dc00033a5c557.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_partition.h')
| -rw-r--r-- | sql/sql_partition.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index 838006203c0..ea3802b49fe 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -1,7 +1,8 @@ #ifndef SQL_PARTITION_INCLUDED #define SQL_PARTITION_INCLUDED -/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. + Copyright (c) 2011, 2017, 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 |