summaryrefslogtreecommitdiff
path: root/storage/innobase/include/fil0fil.h
diff options
context:
space:
mode:
authorDaniel Black <danielgb@au.ibm.com>2018-02-04 22:20:52 +1100
committerGitHub <noreply@github.com>2018-02-04 22:20:52 +1100
commita0a9958098604a57f2c53d1a1b0d50407a328da3 (patch)
tree288f260c526778d13abd6ce4a0276104a8271883 /storage/innobase/include/fil0fil.h
parent67f3fb1bc54682a29ee3b407f60b798780db698f (diff)
parentaba15b864af664276261dcbbdaef35268d407af1 (diff)
downloadmariadb-git-a0a9958098604a57f2c53d1a1b0d50407a328da3.tar.gz
Merge branch '10.1' into 10.1-wsrep_sst_rsync_read_MYSQL_BASE_VERSION_config
Diffstat (limited to 'storage/innobase/include/fil0fil.h')
-rw-r--r--storage/innobase/include/fil0fil.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index 81f207d1e20..312b09e1f2d 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2013, 2017, MariaDB Corporation.
+Copyright (c) 2013, 2018, MariaDB Corporation.
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 the Free Software