summaryrefslogtreecommitdiff
path: root/strings/dump_map.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-12-11 19:28:05 +0200
committerMichael Widenius <monty@askmonty.org>2011-12-11 19:28:05 +0200
commit24e452a208adebedce6a8a418265fced66bfb027 (patch)
tree83bc0c6e237fbd9f9dcbd2ac79f03a3b86756239 /strings/dump_map.c
parent8a09adb3eaf036b652b11afea7d9d86a978fa566 (diff)
parent148587461954b544355bc808a89bfed1a70694e1 (diff)
downloadmariadb-git-24e452a208adebedce6a8a418265fced66bfb027.tar.gz
Merge with 5.1 & fixes to IGNORE handling
Diffstat (limited to 'strings/dump_map.c')
-rw-r--r--strings/dump_map.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/strings/dump_map.c b/strings/dump_map.c
index 61e6cbb6e02..b19cc949940 100644
--- a/strings/dump_map.c
+++ b/strings/dump_map.c
@@ -1,5 +1,6 @@
-/* Copyright (c) 2003, 2011, Oracle and/or its affiliates.
+/* Copyright (c) 2003, 2004, 2006 MySQL AB
Copyright (c) 2009-2011, Monty Program Ab
+ Use is subject to license terms.
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
@@ -12,7 +13,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#include <stdio.h>
#include <string.h>