From: Anitha Gopi
Date: May 24 2011 4:56am
Subject: bzr commit into mysql-5.5 branch (anitha.gopi:3396)
List-Archive: http://lists.mysql.com/commits/137920
Message-Id: <201105240457.p4O4vD8v018172@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1042257140=="

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

#At file:///home/anitha/mysql/repo/mysql-5.5-mod/ based on revid:anitha.gopi@stripped

 3396 Anitha Gopi	2011-05-24 [merge]
      Upmerge from 5.1

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/disabled.def
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-24 04:33:59 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 04:55:56 +0000
@@ -12,7 +12,8 @@ main.lock_multi_bug38499                
 main.outfile_loaddata @solaris           # Bug#11755168 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
 main.signal_demo3 @solaris               # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-query_cache_28249                        # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
+main.query_cache_28249                   # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
+main.log_tables-big                      # Bug#11756699 2010-11-15 mattiasj report already exists
 main.type_float @freebsd                 # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.wait_timeout @solaris               # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris
 

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-05-24 04:33:59 +0000
+++ b/mysql-test/t/disabled.def	2011-05-24 04:55:56 +0000
@@ -10,7 +10,6 @@
 #
 ##############################################################################
 lowercase_table3         : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX
-log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 read_many_rows_innodb    : Bug#11748886 2010-11-15 mattiasj report already exists
 sum_distinct-big         : Bug#11764126 2010-11-15 mattiasj was not tested
 alter_table-big          : Bug#11748731 2010-11-15 mattiasj was not tested


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-5.5-mod/
# testament_sha1: c0f753c337aa82cf0aa357730a6dc9ca41709781
# timestamp: 2011-05-24 10:27:02 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.1-mod/
# base_revision_id: anitha.gopi@stripped\
#   15q6r436hv46qk0k
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUhKsAQABHj/gAAQkABYY//3
coICAL////BgB3w+AAAAoFAAAAw0NAAABoAAAAAw0NAAABoAAAAAw0NAAABoAAAAASmoI0TU2Sej
JPUyABo9Q02poAw0NAAABoAAAAAKlEAEJiaMQJhAFNDTQ00zmg1mSDf47rXWjn6i94F180dL840W
TEEwfE8DAswWacm0TzwP1+ZagI1yuDcGgEIQkkxw9hqOMSM44sEzlVbKFUXWOplyzPypmgoqUHOR
QbDE7K6dOFWAcIDpst9ZeHFB8obrk4CbUVaW5zMZGuArzNRz/111/IvvqR9Ppsnrnu9D4ZbrY7Dt
cDxkk41cBbcWmMTo9lFTPryfw8XZGS5hrWvfAxTNPlA1naU0vVrWYUp/1pehnSUptWyl0TwLaWqC
dygLtrVuOSeH4wapivkkoWalZJNi5RbjwWaMc/qZydlsXUmkXNFzYyyyYN3OJ6x/4b23jJ+uNZSy
s3XGd/q1+fFLpJPI5fVlhJJ9Vq5846NpTmv3sd+Xd1uswcc1xvYuSx6Mr3Uf5lj2cF3HxL6xZ38H
e39OB9ezo0mB2FIp3MM1vYpvuebLC828urHJvulMLLadaaml0TiYUSlJJMXdda0V7bmdzJMN7G2t
tkZySapm1WZuC9sutjhbqt6fd/xfGvlfk6NedsNDb/RfeuuXG0zmVyvRwsKO29Yw33F7LKLHJ1z7
22Tv272UX+8bnHgKnbwVmVru+roPiJguwamMWFJJMbRVLMLJxXrlYpKRtj4N7fcrdEYLbLo8xj0w
NmTBc6ZroKOSbrOm50ad0SufTHa8zpW3Z2SnW7yXtTq2tGeORstrsiYySaZ7y+jNb6I+Udq/Ice0
U7FYdlM2xi4avXujz1b2LRc4RqqussRhjtcM779F+iusUV6F6zFjVlsdaNGfzWNryUnY7nCTDZhV
ywYRtj+YoPnFNP6M3NnnTe+opgcHa3Nvg6reLiOe7Yw0urkXUo7mzk9onbeu2blbTRdqro8xtdmZ
lMr2xfiuqt3MOxss7Ll/HKu9d29kZrjObaYK627IomFrxt3V8d3LBwUYqsrGbKk0a7DSzcw4adox
tsaRgprSyDResXOCly9VMVywUYKXJjDDFR4P2TxbJlSj1baKSxRRZU7X7ng94C0pkkmQyQvqqCgm
c42lRyDxCZjHF4x5OZh3t2VhOHPjHHk0ei/709Fsm259vvAtemnjxupcrD18JnJ4adOZawckeLvl
FUorKK/w9+CTTVPGNqe/r4eXtZVzfV1XWKOnk516t9Lqr3iufO0feO58SS5889ePybNeNlcfZ+XT
Cxe/rveq/gvKVUgej9QOLetUZyibnH4W8F7NzbJMBxqpvuRfg6OR+Yn7t6cHuo3ZaqeyfS55HhE/
S4sKpcxiHp6vZ7DAijObS7ZLqczxCrCJGDELmg735PsXup+VFf07DSFf18nhfespJx4KTY9vut9l
bm9xzqsHJRPZkuuo5d9V+n8LDendJ0So8imHTov+L4fR3ei5fKMkez4S1FrYm485v9/pc+74X+jw
y8XlpVWVZ7tE+WOHNolWdvFKD+x8jM+InrWbFFFWFHSfhx6fSRU9HhA0ae0TnPGQehKt1h0PeOEn
yWvBToLIG+zrXk3Pwii5cnniTl9DKS842y6J3w28DQ/34O1c1OSNW6Tmj88ZB9z4YHzp5x9nV1OP
6ijzj5x9nnDNY8JMGQtRqqZqHuaQKC16DHve7ib1vvgVxtTYtWHNXkygc4n7CrV6+0U1M5OHkqdW
L5L1yfZ4lVrC9SUcorEqmZishYpFz/q2B0LS50kK0FEofHLa7L3LA6rVJBVHkoosn8ucD+YHdpDW
Kqpp1Y/+8fF2OCVO7moUFqeZ6HtJrENqf1nzs5l7Zo/xHB+IyO57v2ieWwvjdIj5NtyTt2PdVMXz
pJjG3wW8W669SSi/TuWWd70k/27VzdPelKTYXoob+5meFCnwf4f6UcvsbJNYa009d21wcU/C9Yeg
vX2SVWN7ZioKNJIYu67RqfVaxzholqlb6jJlx+H8SyPFRNMvwOw/Uby7VKu1H915+73HlG6JeKqI
xPQy38U+UTdEqzjwGB+w9Tt740bHB/8XckU4UJBISrAE


--===============1042257140==--