From: Mattias Jonsson
Date: January 27 2011 10:47pm
Subject: bzr commit into mysql-5.1 branch (mattias.jonsson:3556)
List-Archive: http://lists.mysql.com/commits/129821
Message-Id: <201101272248.p0RMHRj6014278@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8464316000401890804=="

--===============8464316000401890804==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mattiasj/mysql-bzr/topush-5.1/ based on revid:mattias.jonsson@stripped

 3556 Mattias Jonsson	2011-01-27
      Update of copyright headers for files I changed this year.

    modified:
      sql/item.h
      sql/item_func.h
      sql/item_timefunc.h
      sql/sql_partition.cc
      sql/table.cc
=== modified file 'sql/item.h'
--- a/sql/item.h	2011-01-04 13:13:20 +0000
+++ b/sql/item.h	2011-01-27 22:47:24 +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/item_func.h'
--- a/sql/item_func.h	2011-01-04 13:13:20 +0000
+++ b/sql/item_func.h	2011-01-27 22:47:24 +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/item_timefunc.h'
--- a/sql/item_timefunc.h	2010-12-22 14:45:17 +0000
+++ b/sql/item_timefunc.h	2011-01-27 22:47:24 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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_partition.cc'
--- a/sql/sql_partition.cc	2011-01-26 15:50:21 +0000
+++ b/sql/sql_partition.cc	2011-01-27 22:47:24 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* 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/table.cc'
--- a/sql/table.cc	2010-12-01 11:20:46 +0000
+++ b/sql/table.cc	2011-01-27 22:47:24 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* 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


--===============8464316000401890804==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   lzwggppdfbiq6ixs
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.1/
# testament_sha1: 26188f5b6256878d48dc0e68a095d9646c66ecc0
# timestamp: 2011-01-27 23:47:35 +0100
# source_branch: file:///Users/mattiasj/mysql-bzr/b54483-51-bt_2/
# base_revision_id: mattias.jonsson@stripped\
#   2gstc26k196fscpe
# 
# Begin bundle
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
d445ZFBfwUwOwxwHCX9i7kinChIMFa5xAA==


--===============8464316000401890804==--