List:Commits« Previous MessageNext Message »
From:Anitha Gopi Date:May 24 2011 4:31pm
Subject:bzr push into mysql-5.5 branch (anitha.gopi:3399)
View as plain text  
 3399 Anitha Gopi	2011-05-24 [merge]
      Autocommit - Updating local tree

    modified:
      mysql-test/r/variables-big.result
      mysql-test/t/variables-big.test
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/include/buf0buf.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/lock0lock.ic
      storage/innobase/include/row0row.h
      storage/innobase/include/row0row.ic
      storage/innobase/lock/lock0lock.c
      storage/innobase/row/row0row.c
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-23 11:33:41 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 10:17:52 +0000
@@ -2,7 +2,6 @@
 # in alphabetical order. This also helps with merge conflict resolution.
 
 binlog.binlog_multi_engine               # joro : NDB tests marked as experimental as agreed with bochklin
-binlog.binlog_bug23533                   # skozlov: BUG#12371924
 
 funcs_1.charset_collation_1              # depends on compile-time decisions
 
@@ -12,6 +11,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
+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-23 11:33:41 +0000
+++ b/mysql-test/t/disabled.def	2011-05-24 06:40:38 +0000
@@ -10,8 +10,6 @@
 #
 ##############################################################################
 lowercase_table3         : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX
-query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
-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


Attachment: [text/bzr-bundle] bzr/anitha.gopi@oracle.com-20110524162755-14y7s0hxzhftpmlj.bundle
Thread
bzr push into mysql-5.5 branch (anitha.gopi:3399) Anitha Gopi24 May