From: Mattias Jonsson
Date: January 28 2011 12:37pm
Subject: bzr commit into mysql-5.1 branch (mattias.jonsson:3557)
List-Archive: http://lists.mysql.com/commits/129855
Message-Id: <201101281238.p0SCc4Bt006923@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0972554569870435107=="

--===============0972554569870435107==
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

 3557 Mattias Jonsson	2011-01-28
      minor fix of copyright header

    modified:
      sql/item_timefunc.h
=== modified file 'sql/item_timefunc.h'
--- a/sql/item_timefunc.h	2011-01-27 22:47:24 +0000
+++ b/sql/item_timefunc.h	2011-01-28 12:37:39 +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


--===============0972554569870435107==
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\
#   lyb84h4fdbbouyqg
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.1/
# testament_sha1: e192938f53ffd223530fb099d4a325efa66ad175
# timestamp: 2011-01-28 13:37:51 +0100
# source_branch: file:///Users/mattiasj/mysql-bzr/b54483-51-bt_2/
# base_revision_id: mattias.jonsson@stripped\
#   lzwggppdfbiq6ixs
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWaoXxQAAWVfgAAQUHf/93oS
gAC////wUAN9Pc9tjdkzemvCSiNQnghqeCehE08piGhppoNMJSmqeZGaptTU/SnqPU9TBGmRhBk0
MCSTQmhkhPJqnkTDUehGgNAGDJKNqekNGTaaQNAGmgAaD1AkkgBqZNPU0NNT1PUyNGQAGgMnHWqV
JmpIBdSElaORQRVdmKk9uRgcFm21RsLkbWtPXizpy6y/EOnq1vcw+mFRzonfhvTWI2Fz/HK+I6CJ
m20WF4s4OaV1lMmxz0jQnJGzvmiyRUuU8jWY7jVAOIUhkL3D4OJpUaIRjpmpUsHBMzR4yjhHJxeZ
92NeZqIQa5ok4hTNjW1YJvOT7LSrVN6bR4+rLKm6ctKRB8VvQeojAoC2a/HFoSewR6+F09EmAtNT
DFcSvr0XHxHN+4WJgly452GffO4MlQfja8vH3SrQa8NkUbQLSrcLncKBPbPRR97SYq6A1Slj2eYM
5p5yWeWCQIQTEYO6EiQZlHNCIeVlgkwt6VV9iUGEHwZJtIlBRuZr0TvwOo3lxWrCoq5PmWvKVN5Z
22EL5jTq+VWlBF0oknTTaZcF1zR95r304nPRd3j4xSKTvYZm/Lu3W0sYo+HW5eszM5yC7g5p09Op
wO2PfwBbajCvTCUOF10UnVUiUFqGb6ZI6rDQNn5ChTkKd9gahW3rlUsrpBpMYbpo81GdjAXBImru
xZl03SxQruksXiqi3RNp1Cl4eAlWdPJzL3dkOUyFLg05nP/6nPPJn+WS342k3LzgbliVTKXRGFtW
fWdhgdQ1qbqtgKreLbYSEM3O3XkZmqaPJVxREhm0/wlWBHaLWWnDFXVzilGwBo0vI1QrVRAXQAtr
a/fqmOvHKkIEP3g/aV8cbZNAZBeHpnH01vCeDF6RrJdIXEuzYE4ROCbFkhllzhlNaLrGBkihYLWH
qahnXvzJ2NpDPXHuukY0kAcNqmRCLbGXb6FJAtyJMmVbQiXchEwBcwoSEpfESGDS9mSd5IgAjNSj
LqBwRro9jMrgiT4voHCU5rzNmoQFAx1MJnHivR0lteKNte2BHlYeit56TtSbMsZDwSIbH/oWhnA7
MMwbeULlSC34NPVaCapHhY0bmsKGrT5IHZ3RQkBboLMsQqGNpunvBaZ6HYF+r5CwwXkaB1hZEFJZ
i2lYkAi4c0TqLuSKcKEgzVC+KA==


--===============0972554569870435107==--