From: Martin Hansson
Date: January 20 2011 12:32pm
Subject: bzr push into mysql-5.5 branch (martin.hansson:3269 to 3270)
List-Archive: http://lists.mysql.com/commits/129275
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2074640343=="

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

 3270 Martin Hansson	2011-01-20 [merge]
      Merge.

 3269 Martin Hansson	2011-01-20 [merge]
      Merge.

    modified:
      strings/bchange.c
      strings/bmove_upp.c
      strings/conf_to_src.c
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-extra.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-latin1.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype-utf8.c
      strings/ctype-win1250ch.c
      strings/ctype.c
      strings/do_ctype.c
      strings/dtoa.c
      strings/dump_map.c
      strings/int2str.c
      strings/is_prefix.c
      strings/llstr.c
      strings/longlong2str.c
      strings/my_strchr.c
      strings/my_strtoll10.c
      strings/my_vsnprintf.c
      strings/str2int.c
      strings/str_alloc.c
      strings/strappend.c
      strings/strcend.c
      strings/strcont.c
      strings/strend.c
      strings/strfill.c
      strings/strmake.c
      strings/strmov.c
      strings/strnlen.c
      strings/strnmov.c
      strings/strxmov.c
      strings/strxnmov.c
      strings/uca-dump.c
      strings/uctypedump.c
      strings/utr11-dump.c
      strings/xml.c

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@stripped\
#   ko4u8sf72seqzw3h
# target_branch: file:///data0/martin/bzrroot/bug59173/5.5/
# testament_sha1: 48b2295de1d6891f594db88072038883f7749301
# timestamp: 2011-01-20 13:32:31 +0100
# source_branch: file:///data0/martin/bzrroot/bug59173/5.1/
# base_revision_id: martin.hansson@stripped\
#   daabnuovwm7bi1s6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbOPzPMAAd/fgAAQUGP/91JC
AAC////wUAO7x09tTyqgDhJRU/U9KbU9pJ+U09FN6o2U9I2poAAMqeo0MamptTTQAAAAAGppGQjN
I2kGAI0xNMmmmAyppkm1Gn6k/VAGTTQNADIyYRSRoE00yTyCnlPInkQ0NBlHQX/R6CuSjvmhe4Dm
RjLOtgMITUPloydCEE8REEgX6n1/m8tPE00kcMfYE3uj0XYeBkE24xKNdlkez+ES4EriM8C0jUJv
IBKASAjy/NHanASxZJrigg23F0DQF2hIEtw2Bvv+RqC8E9IHCorEoIFjglXRQhbthKWATeA4IpLN
JtbmvvJpiUAW2iN3XO7qsnXgENwnmCQF9cgndqXfjTxq2YhIyrJJb+sJRzXiGdNQQ8JeBQzzKtev
H9vLe+4X2GTCY35RqQwWGJWFCc+IOA2iHC3eT1AehpCzKS3SXzRMucFTaK0Y1+W+VM12yum5mfTl
EYo2QPdd3FcLBAZmbrDMCm8MKHKqhSskHdsWvg2XWu26muYYqyEseJ1Dq2Rnnq9gOWhhMEbQkynS
UMAlFUkAJLj8OGpvb9VRiUFBYSqdZ4FJwIsNyMiskEFRFJYlVZB9TI9DYeZvOr2UOBZBEEe0rTQJ
lCc/GDAnO6bHrCuK/mFE7SSQWzdrHI5XjT5IpBXUqxfRgAs4wpdi7msW4bsdjcFnSGqXemp5kn8E
yLIwq7VHKiC5ZKHcU1E16X9DC0m3zCRhlM0csdvgXR3nScvFINDr47WMvcb9z6F5mMejKVJMrIQw
6DVZ4cOJk2X4Hz1SNsfogOx8DAcm0L/PcdynmczuFonjTq2W2c0pX2BVk5in3FpfovAkmE1atprS
auBxWNgdVCyfk9zg7nMvMS89yCo5kBthE/KXfz/GwoMh0dB+Zt+ju+ywZJm4O0KV+GkC8bSQFKhN
44HqVHqCeTBtH3P3IJEpaHJJHUNCsvKT4Z0kEEKEH4WETNqOizSkjI9VmiZgUwHiyHtaGG4B3kwh
Qg+5S7FDxSxOsh2cXM8tBkUmL6NldRgzDbAQ1gO0kMzmaip6VprlqKSxEmubwa83WVkw3Br+wRwI
rGw7wRaif5uOSJBWOFBBM/4sPIpMeRYEIlaWLKAvPk9gwkUtUD93AbnoGx6r6MwpQGkrkcKgLxdy
RThQkLOPzPM=


--===============2074640343==--