diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-08-03 16:23:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-03 16:23:58 +0200 |
| commit | ab7b672983da567b7599bc331d492154ee915f9b (patch) | |
| tree | 920b38b9324a283211439816e31007bd18d0eb7b /storage/innobase/row/row0sel.cc | |
| parent | 4f479fb13f0da4d18e597192389301e80c27ce56 (diff) | |
| parent | 56544122c75578a23a728e6acafc72dfc449484e (diff) | |
| download | mariadb-git-ab7b672983da567b7599bc331d492154ee915f9b.tar.gz | |
Merge branch 'merge-innodb-5.6' into 10.0
5.6.26
Diffstat (limited to 'storage/innobase/row/row0sel.cc')
| -rw-r--r-- | storage/innobase/row/row0sel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc index 69c8498839e..e93a62d659a 100644 --- a/storage/innobase/row/row0sel.cc +++ b/storage/innobase/row/row0sel.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by |