summaryrefslogtreecommitdiff
path: root/strings/r_strinstr.c
diff options
context:
space:
mode:
authorJohn H. Embretsen <john.embretsen@oracle.com>2011-01-27 12:38:13 +0100
committerJohn H. Embretsen <john.embretsen@oracle.com>2011-01-27 12:38:13 +0100
commit9c2370c25adc30c5fae8ad8854b401275b033210 (patch)
tree731531e8dc9d53d279c572ece74d04283ad6a823 /strings/r_strinstr.c
parent29484d7a66767251666becb7bfc4cf8cead7756f (diff)
parent479a91da4e7e00d7cbf3f1359a878993db8e3675 (diff)
downloadmariadb-git-9c2370c25adc30c5fae8ad8854b401275b033210.tar.gz
Merge two patches for bug 56895 into tip of mysql-5.1 branch.
Diffstat (limited to 'strings/r_strinstr.c')
-rw-r--r--strings/r_strinstr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/r_strinstr.c b/strings/r_strinstr.c
index fb1e0c5a090..4a8aa091a6b 100644
--- a/strings/r_strinstr.c
+++ b/strings/r_strinstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, 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