List:Commits« Previous MessageNext Message »
From:Vinay Fisrekar Date:June 16 2011 4:47am
Subject:bzr push into mysql-trunk branch (vinay.fisrekar:3208 to 3209)
View as plain text  
 3209 Vinay Fisrekar	2011-06-16 [merge]
      merge mysql-5.5 -> trunk , skip test with valgrind due to restart in test

    modified:
      mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
 3208 Davi Arnaut	2011-06-15
      Take two of a prerequisite patch for making const MYSQL_ERROR
      objects useable:
      
      Introduce a const iterator for I_P_List.
      Convert MYSQL_ERROR::m_warn_list to a I_P_List.
      Introduce funciton that returns a const iterator to m_warn_list.
      Remove MYSQL_ERROR::warn_list().
     @ sql/sql_error.cc
        Empty list before the memory root is destroyed.
     @ sql/sql_error.h
        Make m_warn_list a intrusive list and add pointers to MYSQL_ERROR
        so that it can participate in the intrusive list.
        
        Instead of exposing a reference to the list, now provide a const
        iterator.
     @ sql/sql_plist.h
        Reorganize I_P_List_iterator so that the complete list type is
        passed as a base type. The type of the object being stored in
        the list is passed as a additional argument. This allows a const
        qualified version of the type to be specified for the value type
        of the iterator without interfering with the non-qualified type of
        the list.
     @ sql/table.h
        Give a type to the intrusive list of TABLE_SHARE objects.

    modified:
      sql/event_scheduler.cc
      sql/log_event.cc
      sql/rpl_slave.cc
      sql/sp_head.cc
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_plist.h
      sql/sql_prepare.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_test.cc
      sql/table.cc
      sql/table.h
=== modified file 'mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test'
--- a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test	2011-06-02 09:42:55 +0000
+++ b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test	2011-06-16 04:30:51 +0000
@@ -9,6 +9,8 @@
 #                                                                    #
 ######################################################################
 
+# Don't test this under valgrind, memory leaks will occur due restart
+--source include/not_valgrind.inc
 # Test restart the server and "shutdown_server" looks for pid file
 # which is not there with embedded mode
 --source include/not_embedded.inc

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (vinay.fisrekar:3208 to 3209) Vinay Fisrekar16 Jun