diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
commit | da4503e956ee067947e504c6e73052d9d906742c (patch) | |
tree | a70bbc33f0411ef29c347a570d8253445d8013e4 /sql/sql_partition.h | |
parent | babbf8c6fc6da92cd1b2bb23f04e996f84b0ca1a (diff) | |
parent | b000e169562697aa072600695d4f0c0412f94f4f (diff) | |
download | mariadb-git-da4503e956ee067947e504c6e73052d9d906742c.tar.gz |
Merge branch '5.5' into 10.0
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 1b7735b5e96..40690999e32 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 |