3326 Jorgen Loland 2011-01-13
Recorded test results after merge trunk->opt-backporting
modified:
mysql-test/r/innodb_icp_all.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/myisam_icp_all.result
mysql-test/r/select_all_jcl6.result
mysql-test/r/select_icp_mrr_jcl6.result
mysql-test/r/select_none_jcl6.result
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_jcl6.result
mysql-test/r/subquery_nomat_nosj_jcl6.result
mysql-test/r/subquery_none_jcl6.result
mysql-test/r/subquery_sj_mat_nosj.result
mysql-test/r/subquery_sj_none_jcl6.result
mysql-test/r/subquery_sj_none_jcl7.result
3325 Jorgen Loland 2011-01-13 [merge]
Automerge mysql-trunk -> opt-backporting. No conflicts
removed:
include/my_no_pthread.h
mysys/mf_brkhant.c
added:
mysql-test/include/plugin.defs
mysql-test/r/filesort_debug.result
mysql-test/t/filesort_debug.test
modified:
client/mysqladmin.cc
client/mysqlslap.c
client/mysqltest.cc
cmd-line-utils/readline/CMakeLists.txt
config.h.cmake
dbug/dbug.c
dbug/dbug_analyze.c
dbug/my_main.c
dbug/tests.c
include/CMakeLists.txt
include/heap.h
include/my_base.h
include/my_bitmap.h
include/my_global.h
include/my_pthread.h
include/my_sys.h
include/myisam.h
include/thr_alarm.h
libmysql/client_settings.h
libmysql/libmysql.c
mysql-test/collections/README.experimental
mysql-test/collections/default.experimental
mysql-test/collections/mysql-trunk.weekly
mysql-test/include/icp_tests.inc
mysql-test/include/select.inc
mysql-test/include/subquery.inc
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_report.pm
mysql-test/mysql-test-run.pl
mysql-test/r/auto_increment.result
mysql-test/r/func_str.result
mysql-test/r/gis.result
mysql-test/r/innodb_icp.result
mysql-test/r/innodb_icp_all.result
mysql-test/r/innodb_icp_none.result
mysql-test/r/innodb_mysql_sync.result
mysql-test/r/join_outer.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_all.result
mysql-test/r/myisam_icp_none.result
mysql-test/r/mysqlbinlog_row_big.result
mysql-test/r/mysqltest.result
mysql-test/r/not_embedded_server.result
mysql-test/r/partition.result
mysql-test/r/partition_error.result
mysql-test/r/partition_range.result
mysql-test/r/select_all.result
mysql-test/r/select_icp_mrr.result
mysql-test/r/select_none.result
mysql-test/r/show_check.result
mysql-test/r/subquery_all.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_sj_none.result
mysql-test/r/type_timestamp.result
mysql-test/r/udf.result
mysql-test/r/union.result
mysql-test/r/view_grant.result
mysql-test/suite/bugs/t/bug57108.test
mysql-test/suite/engines/funcs/r/db_alter_character_set.result
mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_error.result
mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_ignore.result
mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_error.result
mysql-test/suite/engines/funcs/r/in_string_pk_constraint_error.result
mysql-test/suite/engines/funcs/r/in_string_unique_constraint_error.result
mysql-test/suite/engines/funcs/r/rpl000013.result
mysql-test/suite/engines/funcs/r/rpl_000015.result
mysql-test/suite/engines/funcs/r/rpl_change_master.result
mysql-test/suite/engines/funcs/r/rpl_drop.result
mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result
mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result
mysql-test/suite/engines/funcs/r/rpl_log_pos.result
mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result
mysql-test/suite/engines/funcs/r/rpl_row_drop.result
mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result
mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result
mysql-test/suite/engines/funcs/r/rpl_row_sp005.result
mysql-test/suite/engines/funcs/r/rpl_row_trig003.result
mysql-test/suite/engines/funcs/r/rpl_row_until.result
mysql-test/suite/engines/funcs/r/rpl_server_id1.result
mysql-test/suite/engines/funcs/r/rpl_server_id2.result
mysql-test/suite/engines/funcs/r/rpl_session_var.result
mysql-test/suite/engines/funcs/r/rpl_slave_status.result
mysql-test/suite/engines/funcs/r/rpl_stm_no_op.result
mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result
mysql-test/suite/engines/funcs/r/rpl_temp_table.result
mysql-test/suite/engines/funcs/r/rpl_trigger.result
mysql-test/suite/engines/funcs/r/se_join_left.result
mysql-test/suite/engines/funcs/r/se_join_left_outer.result
mysql-test/suite/engines/funcs/r/se_join_natural_left.result
mysql-test/suite/engines/funcs/r/se_join_natural_left_outer.result
mysql-test/suite/engines/funcs/r/sf_alter.result
mysql-test/suite/engines/funcs/r/sf_cursor.result
mysql-test/suite/engines/funcs/r/sp_alter.result
mysql-test/suite/engines/funcs/r/sp_cursor.result
mysql-test/suite/engines/funcs/r/ta_rename.result
mysql-test/suite/engines/funcs/t/db_alter_collate_utf8.test
mysql-test/suite/engines/funcs/t/disabled.def
mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_error.test
mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_ignore.test
mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_error.test
mysql-test/suite/engines/funcs/t/in_string_pk_constraint_error.test
mysql-test/suite/engines/funcs/t/in_string_unique_constraint_error.test
mysql-test/suite/engines/funcs/t/rpl000013.test
mysql-test/suite/engines/funcs/t/rpl_000015.test
mysql-test/suite/engines/funcs/t/rpl_change_master.test
mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable.test
mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test
mysql-test/suite/engines/funcs/t/rpl_get_lock.test
mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test
mysql-test/suite/engines/funcs/t/rpl_loadfile.test
mysql-test/suite/engines/funcs/t/rpl_log_pos.test
mysql-test/suite/engines/funcs/t/rpl_misc_functions.test
mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test
mysql-test/suite/engines/funcs/t/rpl_row_drop.test
mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test
mysql-test/suite/engines/funcs/t/rpl_row_until.test
mysql-test/suite/engines/funcs/t/rpl_server_id1.test
mysql-test/suite/engines/funcs/t/rpl_server_id2.test
mysql-test/suite/engines/funcs/t/rpl_slave_status.test
mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
mysql-test/suite/engines/funcs/t/rpl_temp_table.test
mysql-test/suite/engines/funcs/t/rpl_temporary.test
mysql-test/suite/engines/funcs/t/rpl_trigger.test
mysql-test/suite/engines/funcs/t/se_join_left.test
mysql-test/suite/engines/funcs/t/se_join_left_outer.test
mysql-test/suite/engines/funcs/t/se_join_natural_left.test
mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test
mysql-test/suite/engines/iuds/r/insert_number.result
mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
mysql-test/suite/engines/iuds/r/strings_update_delete.result
mysql-test/suite/engines/iuds/r/type_bit_iuds.result
mysql-test/suite/engines/iuds/r/update_delete_calendar.result
mysql-test/suite/engines/iuds/r/update_delete_number.result
mysql-test/suite/engines/iuds/t/disabled.def
mysql-test/suite/engines/iuds/t/insert_number.test
mysql-test/suite/engines/iuds/t/update_delete_calendar.test
mysql-test/suite/innodb/r/innodb-timeout.result
mysql-test/suite/innodb/r/innodb.result
mysql-test/suite/innodb/t/innodb-timeout.test
mysql-test/suite/innodb/t/innodb.test
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
mysql-test/suite/perfschema/include/binlog_common.inc
mysql-test/suite/perfschema/r/binlog_mix.result
mysql-test/suite/perfschema/r/binlog_row.result
mysql-test/suite/perfschema/r/binlog_stmt.result
mysql-test/suite/perfschema/r/server_init.result
mysql-test/suite/perfschema/t/binlog_mix.test
mysql-test/suite/perfschema/t/binlog_row.test
mysql-test/suite/perfschema/t/binlog_stmt.test
mysql-test/suite/perfschema/t/server_init.test
mysql-test/t/auto_increment.test
mysql-test/t/bug46261.test
mysql-test/t/fulltext_plugin.test
mysql-test/t/func_str.test
mysql-test/t/gis.test
mysql-test/t/innodb_mysql_sync.test
mysql-test/t/join_outer.test
mysql-test/t/mysqlbinlog_row_big.test
mysql-test/t/mysqltest.test
mysql-test/t/not_embedded_server.test
mysql-test/t/partition.test
mysql-test/t/partition_error.test
mysql-test/t/partition_range.test
mysql-test/t/plugin.test
mysql-test/t/plugin_auth_qa_2-master.opt
mysql-test/t/plugin_auth_qa_3-master.opt
mysql-test/t/plugin_not_embedded.test
mysql-test/t/show_check.test
mysql-test/t/type_timestamp.test
mysql-test/t/udf.test
mysql-test/t/union.test
mysql-test/t/view_grant.test
mysys/mf_iocache.c
mysys/mf_iocache2.c
mysys/mf_keycache.c
mysys/mf_keycaches.c
mysys/my_bitmap.c
mysys/my_fopen.c
mysys/my_fstream.c
mysys/my_gethostbyname.c
mysys/my_getsystime.c
mysys/my_init.c
mysys/my_lib.c
mysys/my_open.c
mysys/my_pread.c
mysys/my_pthread.c
mysys/my_read.c
mysys/my_static.c
mysys/my_thr_init.c
mysys/my_write.c
mysys/mysys_priv.h
mysys/thr_alarm.c
mysys/thr_lock.c
mysys/thr_mutex.c
mysys/thr_rwlock.c
sql-common/client.c
sql-common/client_plugin.c
sql/bounded_queue.h
sql/client_settings.h
sql/filesort.cc
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.h
sql/item_geofunc.h
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.cc
sql/item_timefunc.h
sql/log.cc
sql/log_event.cc
sql/log_event.h
sql/net_serv.cc
sql/sql_admin.cc
sql/sql_base.cc
sql/sql_partition.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_string.cc
sql/sql_string.h
sql/sql_udf.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
storage/heap/heapdef.h
storage/heap/hp_block.c
storage/heap/hp_create.c
storage/heap/hp_open.c
storage/heap/hp_static.c
storage/heap/hp_test2.c
storage/innobase/btr/btr0btr.c
storage/innobase/btr/btr0cur.c
storage/innobase/buf/buf0buf.c
storage/innobase/dict/dict0dict.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/i_s.cc
storage/innobase/include/btr0cur.h
storage/innobase/include/data0data.h
storage/innobase/include/data0data.ic
storage/innobase/include/row0upd.h
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0rw.h
storage/innobase/include/trx0i_s.h
storage/innobase/include/trx0purge.h
storage/innobase/include/univ.i
storage/innobase/log/log0recv.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0purge.c
storage/innobase/row/row0umod.c
storage/innobase/row/row0upd.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/trx/trx0i_s.c
storage/innobase/trx/trx0purge.c
storage/innobase/ut/ut0dbg.c
storage/myisam/ha_myisam.cc
storage/myisam/mi_check.c
storage/myisam/mi_close.c
storage/myisam/mi_delete.c
storage/myisam/mi_delete_all.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_static.c
storage/myisam/mi_statrec.c
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisamdef.h
storage/myisam/sort.c
storage/myisammrg/myrg_def.h
tests/thread_test.c
3324 Jorgen Loland 2011-01-13 [merge]
Null-merge mysql-trunk -> opt-backporting
3323 Jorgen Loland 2011-01-13 [merge]
Automerge mysql-trunk -> opt-backporting.
No conflicts.
modified:
include/my_base.h
mysql-test/collections/default.experimental
sql/ha_partition.cc
sql/sql_show.cc
storage/innobase/handler/ha_innodb.cc
3322 Roy Lyseng 2011-01-13
Bug#58561: Server Crash with correlated subquery and MyISAM tables
when semijoin=on
The problem here is that the variable 'sargables' contains invalid data
after call to update_ref_and_keys(), causing a segmentation fault.
Further inspection showed that the number of conditions was calculated
erroneously, and it was also noticed that it was because
thd->lex->current_select was not equal to select_lex passed as argument.
The culprit was found to be subselect_single_select_engine::exec()
that did not restore the value of 'current_select' after an engine
was changed.
Problem is fixed by restoring current_select properly.
We also clean up the code slightly by replacing
thd->lex->current_select in update_ref_and_keys()
with the passed select_lex argument.
mysql-test/include/subquery.inc
Added test case for bug#58561.
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_jcl6.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_jcl6.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_none_jcl6.result
Added test results for bug#58561.
sql/item_subselect.cc
In subselect_single_select_engine::exec(), restored saved
'current_select' when an engine is changed.
Implemented 'clean exit' policy as a code cleanup fix.
sql/sql_select.cc
In update_ref_and_keys(), replaced reference to
thd->lex->current_select with the select_lex passed as argument.
This is a code cleanup fix.
modified:
mysql-test/include/subquery.inc
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_jcl6.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_jcl6.result
mysql-test/r/subquery_none.result
mysql-test/r/subquery_none_jcl6.result
sql/item_subselect.cc
sql/sql_select.cc
Diff too large for email (60005 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (jorgen.loland:3322 to 3326) | Jorgen Loland | 13 Jan |
