summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-14 13:55:28 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-14 13:55:28 +0200
commitae29ea2d86cd3fe5b2016baf595744cfb44c52cd (patch)
tree6f5017d7d25380d567084842e35015f52724e8d1 /extra
parent1b50d599606244677215fbe7b05be1a891fecf18 (diff)
parentef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (diff)
downloadmariadb-git-ae29ea2d86cd3fe5b2016baf595744cfb44c52cd.tar.gz
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/src/log.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/extra/yassl/src/log.cpp b/extra/yassl/src/log.cpp
index 13c68295747..c4be306a7b8 100644
--- a/extra/yassl/src/log.cpp
+++ b/extra/yassl/src/log.cpp
@@ -1,6 +1,5 @@
/*
- Copyright (C) 2000-2007 MySQL AB
- Use is subject to license terms
+ Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
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