summaryrefslogtreecommitdiff
path: root/mysys/mf_iocache.c
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-04-21 10:20:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-04-21 10:20:20 +0300
commit28f01f82e1cb682566017b52017469be7638dd49 (patch)
treed496cb0936d25973b95f6eb591508c2e493032b8 /mysys/mf_iocache.c
parenta3099a3b4a394da360b5c1e7ae6dc985ae2f7f2f (diff)
parent80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (diff)
downloadmariadb-git-bb-10.6-merge.tar.gz
WIP merge 10.5 to 10.6bb-10.6-merge
FIXME: Disabled tests due to upgrading libmariadb: main.mysql_client_test main.mysql_client_test_nonblock main.mysql_client_test_comp
Diffstat (limited to 'mysys/mf_iocache.c')
-rw-r--r--mysys/mf_iocache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 82ab6f20646..2d6031fa8cd 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2011, Oracle and/or its affiliates
- Copyright (c) 2010, 2020, MariaDB
+ Copyright (c) 2010, 2021, 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