mysql-5.5.18 merge

5 files changed, 16 insertions, 13 deletions

diff --git a/libservices/HOWTO b/libservices/HOWTO
index b4960cb11dc..7edafa89268 100644
--- a/libservices/HOWTO
+++ b/libservices/HOWTO
@@ -1,3 +1,5 @@
+Copyright (c) 2009 Sun Microsystems, Inc.
+
 How to create a new service
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/libservices/my_snprintf_service.c b/libservices/my_snprintf_service.c
index 40d778e4b8d..8ac507394b0 100644
--- a/libservices/my_snprintf_service.c
+++ b/libservices/my_snprintf_service.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009 Sun Microsystems, Inc.
+   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
@@ -11,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include <service_versions.h>
 SERVICE_VERSION my_snprintf_service= (void*)VERSION_my_snprintf;
diff --git a/libservices/my_thread_scheduler_service.c b/libservices/my_thread_scheduler_service.c
index dc8d40c6713..0bbad39dd0a 100644
--- a/libservices/my_thread_scheduler_service.c
+++ b/libservices/my_thread_scheduler_service.c
@@ -1,19 +1,18 @@
 /*
-  Copyright (C) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
   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; version 2 of the License.
 
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
   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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
 #include <service_versions.h>
diff --git a/libservices/thd_alloc_service.c b/libservices/thd_alloc_service.c
index 5d4d496774c..65e3fc490c8 100644
--- a/libservices/thd_alloc_service.c
+++ b/libservices/thd_alloc_service.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009 Sun Microsystems, Inc.
+   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
@@ -11,7 +12,7 @@
 
    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include <service_versions.h>
 SERVICE_VERSION *thd_alloc_service= (void*)VERSION_thd_alloc;
diff --git a/libservices/thd_wait_service.c b/libservices/thd_wait_service.c
index 3c87a2d0d1b..8cec4eecf77 100644
--- a/libservices/thd_wait_service.c
+++ b/libservices/thd_wait_service.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
   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 +12,7 @@
 
   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
 #include <service_versions.h>