summaryrefslogtreecommitdiff
path: root/storage/innobase/trx/trx0sys.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-20 15:34:59 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-20 15:34:59 +0300
commit4b959bd8df18a281248c7325a61f4a79ce7691da (patch)
treea1ad0e5b950eea62a6eebe4b26e820269654f17c /storage/innobase/trx/trx0sys.cc
parent0a7faed75ad49b99bace0882f89e08639c85679b (diff)
parentacc58fd83584c49049951a2c54c7f82a0c7ec412 (diff)
downloadmariadb-git-4b959bd8df18a281248c7325a61f4a79ce7691da.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/trx/trx0sys.cc')
-rw-r--r--storage/innobase/trx/trx0sys.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc
index e1d72f14e3a..632ad7f61c8 100644
--- a/storage/innobase/trx/trx0sys.cc
+++ b/storage/innobase/trx/trx0sys.cc
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2019, MariaDB Corporation.
+Copyright (c) 2017, 2020, 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