From: Kent Boortz
Date: February 16 2012 11:18am
Subject: bzr push into mysql-5.0 branch (kent.boortz:2910 to 2911)
List-Archive: http://lists.mysql.com/commits/142906
Message-Id: <20120216111830.3EC51F018F@tyr80.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2911 MySQL Build Team	2012-02-15
      Updated/added copyright headers

    modified:
      client/sql_string.cc
      include/heap.h
      include/m_string.h
      myisam/ft_stopwords.c
      myisam/mi_preload.c
      mysys/my_compare.c
      mysys/my_init.c
      mysys/my_symlink.c
      sql/item.cc
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/my_decimal.h
      sql/sp_head.cc
      sql/sql_class.cc
      sql/sql_load.cc
      sql/sql_select.cc
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_view.cc
      sql/unireg.h
      strings/decimal.c
 2910 Ramil Kalimullin	2012-01-30
      Fix for BUG#13596377: MYSQL CRASHES ON STARTUP ON FREEBSD IN PB2
      
      Fix for #36428/#38364 backported into 5.0.

    modified:
      mysys/my_init.c
=== modified file 'client/sql_string.cc'
--- a/client/sql_string.cc	2011-07-15 12:07:38 +0000
+++ b/client/sql_string.cc	2012-02-15 16:13:47 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2000-2007 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+   Copyright (c) 2000, 2011, 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

=== modified file 'include/heap.h'
--- a/include/heap.h	2011-03-22 12:50:14 +0000
+++ b/include/heap.h	2012-02-15 16:13:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'include/m_string.h'
--- a/include/m_string.h	2011-07-15 12:07:38 +0000
+++ b/include/m_string.h	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000, 2001, 2003-2007 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'myisam/ft_stopwords.c'
--- a/myisam/ft_stopwords.c	2011-03-22 12:50:14 +0000
+++ b/myisam/ft_stopwords.c	2012-02-15 16:13:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'myisam/mi_preload.c'
--- a/myisam/mi_preload.c	2011-12-12 13:07:02 +0000
+++ b/myisam/mi_preload.c	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2003, 2005, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2003, 2011, 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

=== modified file 'mysys/my_compare.c'
--- a/mysys/my_compare.c	2011-03-22 12:50:14 +0000
+++ b/mysys/my_compare.c	2012-02-15 16:13:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 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

=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2012-01-30 18:52:33 +0000
+++ b/mysys/my_init.c	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2007 MySQL AB, 2008 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2012, 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

=== modified file 'mysys/my_symlink.c'
--- a/mysys/my_symlink.c	2011-07-06 09:36:39 +0000
+++ b/mysys/my_symlink.c	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2001-2003, 2005, 2006, 2008 MySQL AB, 2008 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2001, 2011, 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

=== modified file 'sql/item.cc'
--- a/sql/item.cc	2011-07-06 09:36:39 +0000
+++ b/sql/item.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2011-07-06 09:36:39 +0000
+++ b/sql/item_strfunc.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc	2011-07-06 09:36:39 +0000
+++ b/sql/item_subselect.cc	2012-02-15 16:13:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2011, 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

=== modified file 'sql/item_sum.cc'
--- a/sql/item_sum.cc	2011-07-06 09:36:39 +0000
+++ b/sql/item_sum.cc	2012-02-15 16:13:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/my_decimal.h'
--- a/sql/my_decimal.h	2011-10-14 08:09:53 +0000
+++ b/sql/my_decimal.h	2012-02-15 16:13:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 2011, 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

=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc	2011-07-06 09:36:39 +0000
+++ b/sql/sp_head.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2002-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2002, 2011, 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

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2011-07-06 09:36:39 +0000
+++ b/sql/sql_class.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2008 MySQL AB, 2009, 2010 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/sql_load.cc'
--- a/sql/sql_load.cc	2011-07-06 09:36:39 +0000
+++ b/sql/sql_load.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-07-06 09:36:39 +0000
+++ b/sql/sql_select.cc	2012-02-15 16:13:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/sql_string.cc'
--- a/sql/sql_string.cc	2011-07-15 12:07:38 +0000
+++ b/sql/sql_string.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2007 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-12-12 13:07:02 +0000
+++ b/sql/sql_table.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'sql/sql_view.cc'
--- a/sql/sql_view.cc	2011-10-06 10:23:46 +0000
+++ b/sql/sql_view.cc	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2004, 2011, 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

=== modified file 'sql/unireg.h'
--- a/sql/unireg.h	2011-07-15 12:07:38 +0000
+++ b/sql/unireg.h	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2011, 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

=== modified file 'strings/decimal.c'
--- a/strings/decimal.c	2011-10-14 08:09:53 +0000
+++ b/strings/decimal.c	2012-02-15 16:13:47 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2008 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2004, 2011, 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

No bundle (reason: useless for push emails).