From: Martin Hansson
Date: October 7 2010 11:19am
Subject: bzr commit into mysql-next-mr-opt-team branch (martin.hansson:3226)
List-Archive: http://lists.mysql.com/commits/120232
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0854952966=="

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

#At file:///data0/martin/bzrroot/wl3724/n-mr-o-t-Roy/ based on revid:martin.hansson@stripped

 3226 Martin Hansson	2010-10-07
      Internal commit

    modified:
      sql/Makefile.am
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2010-08-20 09:15:16 +0000
+++ b/sql/Makefile.am	2010-10-07 11:19:01 +0000
@@ -135,7 +135,8 @@ noinst_HEADERS =	item.h item_func.h item
 			sql_prepare.h rpl_handler.h replication.h mdl.h \
 			sql_cmd.h \
 			sql_plist.h transaction.h sys_vars.h sql_truncate.h \
-			sql_admin.h sql_reload.h datadict.h 
+			sql_admin.h sql_reload.h datadict.h \
+			sql_set.h sql_shortcut.h
 
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			item.cc item_sum.cc item_buff.cc item_func.cc \


--===============0854952966==
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\
#   naki0v9hic6s93n3
# target_branch: file:///data0/martin/bzrroot/wl3724/n-mr-o-t-Roy/
# testament_sha1: 57a8f2a3c0f111b100e543527acbd9a0de79fc9d
# timestamp: 2010-10-07 13:19:06 +0200
# base_revision_id: martin.hansson@stripped\
#   iv4ap5giawtj6fs2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaYTI0oAAW7fgAAwUGP/91Ji
EAS////wUANj26qLuiu8t6EkkZNKbJgqeZGjUZomo2oeTSAwkpJjTI0NJkmNT1NpNDRoADQElGgm
UzUyaaammiPUYT0mgZBoDFU2ETIDTRpo0AAAAaBJTU1R7VP0p5qjwUMR6j1NqZB6gBtQwwaMmv6N
+e9hdC0k066AHvdr1xkg+vnrZmO3U+JYMTYvqez5i7s3Xt/vxV8MoDGm/xVTpfzTmRlJAFVdY2Cw
7kuoVdl1268hbeJUkPJzJFjTvulFFqhwjE0CcgYRQMmctfM9UlrARGNqnXsacc3UKog5PFPjIhHH
lIbSDrhNpFLNEe/qfay+6xXK04/UNWSbvH6zOku1hdBxhjgx1PL8ob5dVBGt5Zap5GV1bVZHr+zF
mZA207ixpIollTCqaWWqUeyieeijG7YLA0D3p2L90Gam/RMrcT2UCUMjPw2HaW0L8XB7Rzcp3sRT
yUw3FSzdCY0zzrT75KKDBktkK1zW8WmaKsHC2RyjuVddQ27V1wM4279+OXXTF+wZt1+cic5WrOOB
EVOYrnkCBwoakTsFfkxc12MLZumZoeTiydN0SASm7oaaaUdz3Ll9ujQERKOHHo+vKju5tbsJobj5
Pg53EYOH+y48O5I66n824FbQ7D81lyWjkpHz/dwjNRiimkFBkKFzyfOevlwGkkbM4wy4BzKBb/Y9
nF8vU0uZI2JHGh+qXZbCglsr7lpfcU1qCwGveHQWOj5kvHk9CbtP4aOXQAjbBxedM8JMXOjEM68V
Nu0N29PNlt304Nq8OPquyZZHpfXxbdu2ksQepNRtno1jrKbyUytIhH1Kiv+SrPPPY4x7ptNKK10q
t6IuNgOSJ7hSVLDITExbebeKxE1z881k0XlYmOl2DhFQS/dls1gYhA5VNTFMeI6iGJFkFgN97wiT
hcUSg8OAaEhjCevdNHrFeaRiZL1PQc/h2KbWMtDlsOc5l18SjnOg9IeSCgCwFuN7gGpsrw9xIuCp
F6KMcMAkuwzEHkJ4pkKwIXBwqJFIFg6N8BvfrUZlN/AkWB2SKljZxqNckqy1VUl5/GKK/CxOM1sb
yyjfKNUh4Zr5intlhRxvcbAbkTLhFI5cmj/7mai5IalFkJcOEPeD6h1PnJbZPA4Xu1OtGJFSqBwa
GKmy92pse1q9xOWkMiDXqOXv2MCdWr6SkdI/5F3JFOFCQphMjSg=


--===============0854952966==--