summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-12-19 11:35:44 +0100
committerSergei Golubchik <sergii@pisem.net>2014-12-19 11:35:44 +0100
commita978bdda1e2de35c79e432f026869e163657a263 (patch)
tree73e36b02fe3b8515c1f05bf4d43ecfa0bbf7c420 /libmysqld
parent724dbaabc0d06c4446417eb217d8536f193461f9 (diff)
parent0773c7f422c426e5693fc901df9999092e56aef3 (diff)
downloadmariadb-git-a978bdda1e2de35c79e432f026869e163657a263.tar.gz
mysql-5.5.41 merge
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index db6cb2bf561..3d6ca5a3810 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -2,6 +2,9 @@
* Copyright (c) 2000
* SWsoft company
*
+ * Modifications copyright (c) 2001, 2013. Oracle and/or its affiliates.
+ * All rights reserved.
+ *
* This material is provided "as is", with absolutely no warranty expressed
* or implied. Any use is at your own risk.
*