summaryrefslogtreecommitdiff
path: root/libmysql/errmsg.c
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-08-18 19:57:55 +0200
committerserg@serg.mylan <>2004-08-18 19:57:55 +0200
commite1237cbc53355382e032f0e88f906d67edd1f597 (patch)
tree8ac7985dc9b6caddd1c2402ef8606e4a4cd85ada /libmysql/errmsg.c
parent7c69afaf15eda7d51b2254e71c7078aaab3aa0f3 (diff)
parent8ce92878a2c32785a5af86e9ffa27b4904d01694 (diff)
downloadmariadb-git-e1237cbc53355382e032f0e88f906d67edd1f597.tar.gz
manually merged
Diffstat (limited to 'libmysql/errmsg.c')
-rw-r--r--libmysql/errmsg.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index 2b941470fc3..82040100ded 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -1,9 +1,12 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (C) 2000-2004 MySQL 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS-CLIENT in the directory of this software distribution.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of