List: | Commits | « Previous MessageNext Message » | |
From: | He Zhenxing | Date: | September 23 2008 6:42am |
Subject: | bzr push into mysql-6.0-rpl branch (hezx:2694) Bug#33414 Bug#35117 Bug#38124 Bug#38349 Bug#38624 Bug#39017 Bug#39369 WL#4073 WL#4189 WL#4350 WL#4380 ... | ||
View as plain text |
2694 He Zhenxing 2008-09-22 [merge] Auto Merge removed: include/mysql_h.ic mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc added: include/mysql.h.pp include/mysql/plugin.h.pp mysql-test/r/backup_db_grants.result mysql-test/r/backup_default.result mysql-test/r/backup_timeout.result mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc mysql-test/t/backup_db_grants.test mysql-test/t/backup_default.test mysql-test/t/backup_timeout.test sql/mysql_priv.h.pp modified: .bzr-mysql/default.conf Makefile.am configure.in include/Makefile.am mysql-test/include/analyze-timeout.test mysql-test/include/report-features.test mysql-test/lib/My/CoreDump.pm mysql-test/lib/My/Find.pm mysql-test/lib/My/Platform.pm mysql-test/lib/mtr_cases.pm mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/backup_errors.result mysql-test/r/backup_views.result mysql-test/r/binlog_format_basic.result mysql-test/r/character_set_connection_func.result mysql-test/r/completion_type_func.result mysql-test/r/concurrent_insert_func.result mysql-test/r/delay_key_write_func.result mysql-test/r/general_log_file_basic.result mysql-test/r/general_log_file_func.result mysql-test/r/innodb_autoextend_increment_basic.result mysql-test/r/innodb_autoinc_lock_mode_func.result mysql-test/r/innodb_fast_shutdown_basic.result mysql-test/r/innodb_max_dirty_pages_pct_func.result mysql-test/r/innodb_table_locks_func.result mysql-test/r/insert_update.result mysql-test/r/key_buffer_size_func.result mysql-test/r/log_basic.result mysql-test/r/log_bin_trust_function_creators_func.result mysql-test/r/log_queries_not_using_indexes_basic.result mysql-test/r/log_state.result mysql-test/r/log_tables.result mysql-test/r/max_allowed_packet_func.result mysql-test/r/max_seeks_for_key_func.result mysql-test/r/max_sort_length_func.result mysql-test/r/myisam_data_pointer_size_func.result mysql-test/r/myisam_stats_method_func.result mysql-test/r/profiling.result mysql-test/r/query_cache_limit_func.result mysql-test/r/query_cache_type_func.result mysql-test/r/query_prealloc_size_func.result mysql-test/r/slow_query_log_file_basic.result mysql-test/r/slow_query_log_file_func.result mysql-test/r/variables-notembedded.result mysql-test/r/variables.result mysql-test/suite/rpl/r/rpl_spec_variables.result mysql-test/suite/rpl/t/rpl_spec_variables.test mysql-test/suite/rpl_ndb_big/t/rpl_ndb_mixed_engines_transactions.test mysql-test/t/backup_errors.test mysql-test/t/backup_views.test mysql-test/t/binlog_format_basic.test mysql-test/t/character_set_connection_func.test mysql-test/t/completion_type_func.test mysql-test/t/concurrent_insert_func.test mysql-test/t/delay_key_write_func.test mysql-test/t/disabled.def mysql-test/t/general_log_file_basic.test mysql-test/t/general_log_file_func.test mysql-test/t/innodb_autoextend_increment_basic.test mysql-test/t/innodb_autoinc_lock_mode_func.test mysql-test/t/innodb_fast_shutdown_basic.test mysql-test/t/innodb_max_dirty_pages_pct_func.test mysql-test/t/innodb_table_locks_func.test mysql-test/t/insert_update.test mysql-test/t/key_buffer_size_func.test mysql-test/t/log_basic.test mysql-test/t/log_bin_trust_function_creators_func.test mysql-test/t/log_queries_not_using_indexes_basic.test mysql-test/t/log_state.test mysql-test/t/log_tables.test mysql-test/t/max_allowed_packet_func.test mysql-test/t/max_seeks_for_key_func.test mysql-test/t/max_sort_length_func.test mysql-test/t/myisam_data_pointer_size_func.test mysql-test/t/myisam_stats_method_func.test mysql-test/t/profiling.test mysql-test/t/query_cache_limit_func.test mysql-test/t/query_cache_type_func.test mysql-test/t/query_prealloc_size_func.test mysql-test/t/slow_query_log_file_basic.test mysql-test/t/slow_query_log_file_func.test mysql-test/t/variables-notembedded.test mysql-test/t/variables.test sql/backup/backup_aux.h sql/backup/backup_info.cc sql/backup/backup_info.h sql/backup/backup_test.cc sql/backup/be_default.cc sql/backup/image_info.cc sql/backup/image_info.h sql/backup/kernel.cc sql/ddl_blocker.cc sql/ha_ndbcluster.cc sql/handler.h sql/mysql_priv.h sql/set_var.cc sql/set_var.h sql/share/errmsg.txt sql/si_objects.cc sql/si_objects.h sql/sql_class.cc sql/sql_class.h sql/sql_insert.cc sql/sql_parse.cc sql/sql_show.cc sql/table.h === modified file 'sql/si_objects.cc' --- a/sql/si_objects.cc 2008-09-11 22:32:15 +0000 +++ b/sql/si_objects.cc 2008-09-22 14:20:26 +0000 @@ -1672,6 +1672,10 @@ ViewBaseObjectsIterator::create(THD *thd my_thd->thread_stack= (char*) &my_thd; my_thd->store_globals(); + + /* after store_globals(), my_thd->mysys_var and thd->mysys_var + should point to the same instance */ + DBUG_ASSERT(my_thd->mysys_var == thd->mysys_var); lex_start(my_thd); TABLE_LIST *tl = @@ -1685,6 +1689,14 @@ ViewBaseObjectsIterator::create(THD *thd { close_thread_tables(my_thd); delete my_thd; + + /* my_thd->mysys_var and thd->mysys_var points to the same + instance, after deletion of my_thd, my_thd->mysys_var is freed, + so thd->mysys_var is no long valid and must be set to NULL */ + pthread_mutex_lock(&thd->LOCK_delete); + thd->mysys_var= NULL; + pthread_mutex_unlock(&thd->LOCK_delete); + thd->store_globals(); return NULL;
Thread | ||
---|---|---|
• bzr push into mysql-6.0-rpl branch (hezx:2694) Bug#33414 Bug#35117 Bug#38124Bug#38349 Bug#38624 Bug#39017 Bug#39369 WL#4073 WL#4189 WL#4350 WL#4380WL#... | He Zhenxing | 23 Sep |