diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-10-26 12:46:47 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-10-26 12:46:47 +0300 |
commit | 3b35d745c3245f63fcc9757bfa90392bf923fcc3 (patch) | |
tree | 5a84b9a11569e6a1442de2b0c221d70a6b8af15f /storage/innobase/fts/fts0que.cc | |
parent | 4274d0bf578aeac9780ffd9ab06aebba48a0fac9 (diff) | |
parent | 4ef64e01a7a6ff8b6b7b2a1c1b7725c24b339aff (diff) | |
download | mariadb-git-3b35d745c3245f63fcc9757bfa90392bf923fcc3.tar.gz |
Merge branch 'merge-innodb-5.6' into 10.0
Diffstat (limited to 'storage/innobase/fts/fts0que.cc')
-rw-r--r-- | storage/innobase/fts/fts0que.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc index c74137031bb..b874309964b 100644 --- a/storage/innobase/fts/fts0que.cc +++ b/storage/innobase/fts/fts0que.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2007, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under |