List:Commits« Previous MessageNext Message »
From:Sneha Modi Date:April 12 2012 5:58am
Subject:bzr push into mysql-trunk branch (sneha.modi:3861 to 3862) Bug#13252426
View as plain text  
 3862 Sneha Modi	2012-04-12 [merge]
      Bug#13252426: 62907: MYSQL_PLUGIN.TEST FAILS ON A RPM-BASED INSTALL.
      
      Applying the patch provided in the bug report to see if it works and merging with the latest
      trunk.

    added:
      mysql-test/suite/binlog/r/binlog_gtid_cache.result
      mysql-test/suite/binlog/t/binlog_gtid_cache-master.opt
      mysql-test/suite/binlog/t/binlog_gtid_cache.test
    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/r/alter_table.result
      mysql-test/r/explain.result
      mysql-test/r/get_diagnostics.result
      mysql-test/r/help.result
      mysql-test/r/innodb_explain_json_non_select_all.result
      mysql-test/r/innodb_explain_json_non_select_none.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_json_non_select_all.result
      mysql-test/r/myisam_explain_json_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/read_only_innodb.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/type_time.result
      mysql-test/r/variables.result
      mysql-test/suite/binlog/r/binlog_rewrite.result
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/r/rpl_mts_debug.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_mts_debug.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_row_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
      mysql-test/t/alter_table.test
      mysql-test/t/help.test
      mysql-test/t/mysql_plugin-master.opt
      mysql-test/t/mysql_plugin.test
      sql/binlog.cc
      sql/handler.cc
      sql/handler.h
      sql/lex.h
      sql/rpl_info_dummy.cc
      sql/rpl_info_dummy.h
      sql/rpl_info_factory.cc
      sql/rpl_info_factory.h
      sql/rpl_info_file.cc
      sql/rpl_info_file.h
      sql/rpl_info_handler.h
      sql/rpl_info_table.cc
      sql/rpl_info_table.h
      sql/rpl_mi.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/share/errmsg-utf8.txt
      sql/sql_lex.h
      sql/sql_table.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      storage/example/ha_example.cc
      storage/innobase/api/api0api.cc
      storage/innobase/api/api0misc.cc
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0dump.cc
      storage/innobase/buf/buf0rea.cc
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/dict/dict0stats.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fts/fts0ast.cc
      storage/innobase/fts/fts0config.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0opt.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/fts/fts0sql.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/api0api.h
      storage/innobase/include/api0misc.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0stats.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fts0ast.h
      storage/innobase/include/fts0fts.h
      storage/innobase/include/fts0priv.h
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/log0recv.h
      storage/innobase/include/que0que.h
      storage/innobase/include/read0read.h
      storage/innobase/include/read0read.ic
      storage/innobase/include/row0ftsort.h
      storage/innobase/include/row0ins.h
      storage/innobase/include/row0log.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0sel.h
      storage/innobase/include/row0uins.h
      storage/innobase/include/row0umod.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/row0vers.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/srv0start.h
      storage/innobase/include/trx0rec.h
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0undo.h
      storage/innobase/include/ut0ut.h
      storage/innobase/lock/lock0lock.cc
      storage/innobase/log/log0recv.cc
      storage/innobase/os/os0file.cc
      storage/innobase/que/que0que.cc
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0uins.cc
      storage/innobase/row/row0umod.cc
      storage/innobase/row/row0undo.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/row/row0vers.cc
      storage/innobase/srv/srv0conc.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/trx/trx0i_s.cc
      storage/innobase/trx/trx0rec.cc
      storage/innobase/trx/trx0roll.cc
      storage/innobase/trx/trx0sys.cc
      storage/innobase/trx/trx0trx.cc
      storage/innobase/trx/trx0undo.cc
      storage/innobase/ut/ut0ut.cc
      storage/myisam/ha_myisam.cc
 3861 Tor Didriksen	2012-04-11
      WL#6221 THD refactoring, remove ilink inheritance
      
      Remove the ilink ineritance from THD, and remove global variables
      I_List<THD> threads;
      uint volatile thread_count;
      
      Add an interface for manipulating the list of THDs and the count.
     @ libmysqld/lib_sql.cc
        Use add/remove_global_thread()
     @ mysql-test/r/show_check.result
        Tests need sorted_result with the new implementation.
     @ mysql-test/r/sp-threads.result
        Tests need sorted_result with the new implementation.
     @ mysql-test/suite/funcs_1/datadict/processlist_priv.inc
        Tests need sorted_result with the new implementation.
     @ mysql-test/suite/funcs_1/datadict/processlist_val.inc
        Tests need sorted_result with the new implementation.
     @ mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
        Tests need sorted_result with the new implementation.
     @ mysql-test/suite/funcs_1/r/processlist_priv_ps.result
        Tests need sorted_result with the new implementation.
     @ mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
        Tests need sorted_result with the new implementation.
     @ mysql-test/suite/funcs_1/r/processlist_val_ps.result
        Tests need sorted_result with the new implementation.
     @ mysql-test/t/show_check.test
        Tests need sorted_result with the new implementation.
     @ mysql-test/t/sp-threads.test
        Tests need sorted_result with the new implementation.
     @ sql/binlog.cc
        Use Thread_iterator.
     @ sql/event_scheduler.cc
        Use add/remove_global_thread()
        Use Thread_iterator.
     @ sql/global_threads.h
        New interface for keeping list of global threads.
     @ sql/mysqld.cc
        Remove the global variables
        I_List<THD> threads;
        uint volatile thread_count;
        
        global_thread_count is read by a signal handler, so it must be of type sig_atomic_t
        global_thread_list is on the heap, to avoid race conditions during shutdown
        (never deleted, but not reported as a leak)
        
        The list of threads is no longer internal to each THD,
        so we can grab LOCK_thread_count once, and then
        iterate through the list doing close_connection(THD*)
        
        We must keep delete_thd() since it is used by the thread_pool.
        
        Remove unlink_thd(), which locked the mutex, and left it locked.
        
        Rename cache_thread() to block_until_new_connection()
        and let it do it's own mutex lock/unlock.
        
        In bootstrap mode: Tell the signal handler thread to enter it's main loop.
     @ sql/mysqld.h
        Move LOCK_thread_count COND_thread_count to global_threads.h
        Remove unlink_thd()
        Move sql_rnd_with_mutex(), since Lock_thread_count was moved.
     @ sql/rpl_master.cc
        Use Thread_iterator.
     @ sql/rpl_slave.cc
        Use add/remove_global_thread()
     @ sql/scheduler.cc
        Grab and release LOCK_thread_count in the same function.
     @ sql/sql_class.cc
        Use add_global_thread().
     @ sql/sql_class.h
        ilink<THD> is gone!
     @ sql/sql_insert.cc
        Use add_global_thread().
     @ sql/sql_parse.cc
        Use add_global_thread().
        Use Thread_iterator.
     @ sql/sql_plugin.cc
        Dont cast current_thd to (long)
     @ sql/sql_show.cc
        Use Thread_iterator.
     @ storage/perfschema/pfs_check.cc
        current_thd returned pointer to a THD which was deleted.

    modified:
      libmysqld/lib_sql.cc
      mysql-test/r/show_check.result
      mysql-test/r/sp-threads.result
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc
      mysql-test/suite/funcs_1/datadict/processlist_val.inc
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_val_ps.result
      mysql-test/t/show_check.test
      mysql-test/t/sp-threads.test
      sql/binlog.cc
      sql/event_scheduler.cc
      sql/global_threads.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_master.cc
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/scheduler.cc
      sql/signal_handler.cc
      sql/sp_head.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_plugin.cc
      sql/sql_reload.cc
      sql/sql_show.cc
      sql/sql_test.cc
      sql/sys_vars.cc
      storage/perfschema/pfs_check.cc

Diff too large for email (20632 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (sneha.modi:3861 to 3862) Bug#13252426Sneha Modi12 Apr