summaryrefslogtreecommitdiff
path: root/mysys/my_malloc.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-02-26 15:28:07 +0100
committerSergei Golubchik <sergii@pisem.net>2014-02-26 15:28:07 +0100
commit0dc23679c867629ded5f9534d2ab6e8edf238aa0 (patch)
tree9cf966507fa2ef0fd17932b600d051df5f7bd2e5 /mysys/my_malloc.c
parent6efa5efa7dd112b6ac2efdd84235a13cca51c4d4 (diff)
parent0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (diff)
downloadmariadb-git-0dc23679c867629ded5f9534d2ab6e8edf238aa0.tar.gz
10.0-base merge
Diffstat (limited to 'mysys/my_malloc.c')
-rw-r--r--mysys/my_malloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index fd65a54e5a4..e533230106e 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2000, 2010, Oracle and/or its affiliates
- Copyright (c) 2009, 2013, Monty Program Ab.
+ Copyright (c) 2000, 2013, Oracle and/or its affiliates
+ Copyright (c) 2009, 2014, SkySQL Ab
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