diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-31 11:58:29 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-31 11:58:29 +0200 |
commit | 865e807125d1d3fb2d784ea33f1154ba999466ec (patch) | |
tree | ea354d6e52e97f599bb5d3809295daae8c9fceeb /include | |
parent | 14306bcbec0b6a999985008f3d33602c08058006 (diff) | |
parent | 4c21c367b332e4ebfff0b0c1f6f5140d5845588e (diff) | |
download | mariadb-git-865e807125d1d3fb2d784ea33f1154ba999466ec.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include')
-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 9c67034d798..34b2a093e43 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -1,6 +1,6 @@ #ifndef SQL_COMMON_INCLUDED #define SQL_COMMON_INCLUDED -/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. +/* Copyright (c) 2003, 2018, Oracle and/or its affiliates. Copyright (c) 2010, 2018, MariaDB This program is free software; you can redistribute it and/or modify |