summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-28 19:39:30 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-28 19:39:30 +0200
commit11ed10cbe2c7c4b83aca4153856e76f4bdc484dd (patch)
treeda0e622896425203d23ecdfd1bc77b57e3502edf /sql/field.h
parentdfcc0010cf7be502bfca31aff75ba830f6962264 (diff)
parent670f2f62c48741ea72440a1574dc99bae9390131 (diff)
downloadmariadb-git-11ed10cbe2c7c4b83aca4153856e76f4bdc484dd.tar.gz
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 0161f69ac4d..c205c9b5582 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2010 Oracle and/or its affiliates.
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