summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-11-24 13:07:37 +0300
committerAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-11-24 13:07:37 +0300
commit1e43b94c70841866e6c0dc7bcb05bfa2c248faa7 (patch)
treeb3d7ab3039d01aac8146c576686d294ed5b761bf /libmysql
parentcf0cc723aaa08bf6929c3b0bb0ccd3fdca626af0 (diff)
parent85f855e0ed38b73839943a83b2cccb1c46ba6fd9 (diff)
downloadmariadb-git-1e43b94c70841866e6c0dc7bcb05bfa2c248faa7.tar.gz
Merge from mysql-5.0-bugteam.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.am3
-rw-r--r--libmysql/Makefile.shared3
-rw-r--r--libmysql/conf_to_src.c3
-rw-r--r--libmysql/dll.c3
-rw-r--r--libmysql/errmsg.c3
-rw-r--r--libmysql/get_password.c3
-rw-r--r--libmysql/libmysql.c3
-rw-r--r--libmysql/manager.c3
8 files changed, 8 insertions, 16 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index f67abfd8ac6..cb6b70b84d2 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -5,8 +5,7 @@
# published by 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.
+# is applied to this software.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 39c1975888a..a27949eb7ca 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -5,8 +5,7 @@
# published by 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.
+# is applied to this software.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c
index 785e3cad4c1..f39a2e1856f 100644
--- a/libmysql/conf_to_src.c
+++ b/libmysql/conf_to_src.c
@@ -5,8 +5,7 @@
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.
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/dll.c b/libmysql/dll.c
index 8fcf41c792c..8654c035c63 100644
--- a/libmysql/dll.c
+++ b/libmysql/dll.c
@@ -5,8 +5,7 @@
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.
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index 95ee6862aa8..163632127c3 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -5,8 +5,7 @@
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.
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/get_password.c b/libmysql/get_password.c
index cbe5fce6949..63d4e68541f 100644
--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@@ -5,8 +5,7 @@
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.
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index deb7cd10d2a..91225128a1c 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -5,8 +5,7 @@
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.
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/libmysql/manager.c b/libmysql/manager.c
index 53ffffa55c0..ef28f1bd323 100644
--- a/libmysql/manager.c
+++ b/libmysql/manager.c
@@ -5,8 +5,7 @@
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.
+ is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of