- 16 May, 2008 1 commit
-
-
unknown authored
into mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam
-
- 15 May, 2008 6 commits
-
-
unknown authored
into riska.(none):/home/sven/bk/b36433-rpl_insert_id/5.1-bugteam
-
unknown authored
into mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
-
unknown authored
into five.local.lan:/work/trees/mysql-5.1-bugteam-src-clean
-
unknown authored
Bug#28563 Test suite "jp" fails completely - The main goal of this fix is to make the "jp" suite runnable in general and to make it more robust for use in pushbuild under build team conditions. - It was decided to fix the remaining heavy issues within the architecture of this test later (-> WL 4327 Redesign the 'jp' testsuite for build team testing conditions) Only the test jp_trim_sjis got some significant improvements of its architecture (Just as proof of concept for the other tests). - Tests suffering from Bug 36597 Testsuite "jp": Suspicious results for some tests (unexpected result sets) were disabled - *.opt files were used to avoid differences on OS (Windows) because of case sensitive tablenames within the tests mysql-test/suite/jp/r/jp_alter_sjis.result: Updated results mysql-test/suite/jp/r/jp_alter_ucs2.result: Updated results mysql-test/suite/jp/r/jp_alter_ujis.result: Updated results mysql-test/suite/jp/r/jp_alter_utf8.result: Updated results mysql-test/suite/jp/r/jp_charlength_sjis.result: Updated results mysql-test/suite/jp/r/jp_charlength_ucs2.result: Updated results mysql-test/suite/jp/r/jp_charlength_ujis.result: Updated results mysql-test/suite/jp/r/jp_charlength_utf8.result: Updated results mysql-test/suite/jp/r/jp_charset_sjis.result: Updated results mysql-test/suite/jp/r/jp_charset_ucs2.result: Updated results mysql-test/suite/jp/r/jp_charset_ujis.result: Updated results mysql-test/suite/jp/r/jp_charset_utf8.result: Updated results mysql-test/suite/jp/r/jp_convert_sjis.result: Updated results mysql-test/suite/jp/r/jp_convert_ucs2.result: Updated results mysql-test/suite/jp/r/jp_convert_ujis.result: Updated results mysql-test/suite/jp/r/jp_convert_utf8.result: Updated results mysql-test/suite/jp/r/jp_create_db_sjis.result: Updated results mysql-test/suite/jp/r/jp_create_db_ucs2.result: Updated results mysql-test/suite/jp/r/jp_create_db_ujis.result: Updated results mysql-test/suite/jp/r/jp_create_db_utf8.result: Updated results mysql-test/suite/jp/r/jp_create_tbl_sjis.result: Updated results mysql-test/suite/jp/r/jp_create_tbl_ucs2.result: Updated results mysql-test/suite/jp/r/jp_create_tbl_ujis.result: Updated results mysql-test/suite/jp/r/jp_create_tbl_utf8.result: Updated results mysql-test/suite/jp/r/jp_enum_sjis.result: Updated results mysql-test/suite/jp/r/jp_enum_ucs2.result: Updated results mysql-test/suite/jp/r/jp_enum_ujis.result: Updated results mysql-test/suite/jp/r/jp_enum_utf8.result: Updated results mysql-test/suite/jp/r/jp_insert_sjis.result: Updated results mysql-test/suite/jp/r/jp_insert_ucs2.result: Updated results mysql-test/suite/jp/r/jp_insert_ujis.result: Updated results mysql-test/suite/jp/r/jp_insert_utf8.result: Updated results mysql-test/suite/jp/r/jp_instr_sjis.result: Updated results mysql-test/suite/jp/r/jp_instr_ucs2.result: Updated results mysql-test/suite/jp/r/jp_instr_ujis.result: Updated results mysql-test/suite/jp/r/jp_instr_utf8.result: Updated results mysql-test/suite/jp/r/jp_join_sjis.result: Updated results mysql-test/suite/jp/r/jp_join_ucs2.result: Updated results mysql-test/suite/jp/r/jp_join_ujis.result: Updated results mysql-test/suite/jp/r/jp_join_utf8.result: Updated results mysql-test/suite/jp/r/jp_left_sjis.result: Updated results mysql-test/suite/jp/r/jp_left_ucs2.result: Updated results mysql-test/suite/jp/r/jp_left_ujis.result: Updated results mysql-test/suite/jp/r/jp_left_utf8.result: Updated results mysql-test/suite/jp/r/jp_length_sjis.result: Updated results mysql-test/suite/jp/r/jp_length_ucs2.result: Updated results mysql-test/suite/jp/r/jp_length_ujis.result: Updated results mysql-test/suite/jp/r/jp_length_utf8.result: Updated results mysql-test/suite/jp/r/jp_like_sjis.result: Updated results mysql-test/suite/jp/r/jp_like_ucs2.result: Updated results mysql-test/suite/jp/r/jp_like_ujis.result: Updated results mysql-test/suite/jp/r/jp_like_utf8.result: Updated results mysql-test/suite/jp/r/jp_locate_sjis.result: Updated results mysql-test/suite/jp/r/jp_locate_ucs2.result: Updated results mysql-test/suite/jp/r/jp_locate_ujis.result: Updated results mysql-test/suite/jp/r/jp_locate_utf8.result: Updated results mysql-test/suite/jp/r/jp_lpad_sjis.result: Updated results mysql-test/suite/jp/r/jp_lpad_ucs2.result: Updated results mysql-test/suite/jp/r/jp_lpad_ujis.result: Updated results mysql-test/suite/jp/r/jp_lpad_utf8.result: Updated results mysql-test/suite/jp/r/jp_ltrim_sjis.result: Updated results mysql-test/suite/jp/r/jp_ltrim_ucs2.result: Updated results mysql-test/suite/jp/r/jp_ltrim_ujis.result: Updated results mysql-test/suite/jp/r/jp_ltrim_utf8.result: Updated results mysql-test/suite/jp/r/jp_ps_sjis.result: Updated results mysql-test/suite/jp/r/jp_ps_ujis.result: Updated results mysql-test/suite/jp/r/jp_replace_sjis.result: Updated results mysql-test/suite/jp/r/jp_replace_ucs2.result: Updated results mysql-test/suite/jp/r/jp_replace_ujis.result: Updated results mysql-test/suite/jp/r/jp_replace_utf8.result: Updated results mysql-test/suite/jp/r/jp_reverse_sjis.result: Updated results mysql-test/suite/jp/r/jp_reverse_ucs2.result: Updated results mysql-test/suite/jp/r/jp_reverse_ujis.result: Updated results mysql-test/suite/jp/r/jp_reverse_utf8.result: Updated results mysql-test/suite/jp/r/jp_right_sjis.result: Updated results mysql-test/suite/jp/r/jp_right_ucs2.result: Updated results mysql-test/suite/jp/r/jp_right_ujis.result: Updated results mysql-test/suite/jp/r/jp_right_utf8.result: Updated results mysql-test/suite/jp/r/jp_rpad_sjis.result: Updated results mysql-test/suite/jp/r/jp_rpad_ucs2.result: Updated results mysql-test/suite/jp/r/jp_rpad_ujis.result: Updated results mysql-test/suite/jp/r/jp_rpad_utf8.result: Updated results mysql-test/suite/jp/r/jp_rtrim_sjis.result: Updated results mysql-test/suite/jp/r/jp_rtrim_ucs2.result: Updated results mysql-test/suite/jp/r/jp_rtrim_ujis.result: Updated results mysql-test/suite/jp/r/jp_rtrim_utf8.result: Updated results mysql-test/suite/jp/r/jp_select_sjis.result: Updated results mysql-test/suite/jp/r/jp_select_ucs2.result: Updated results mysql-test/suite/jp/r/jp_select_ujis.result: Updated results mysql-test/suite/jp/r/jp_select_utf8.result: Updated results mysql-test/suite/jp/r/jp_subquery_sjis.result: Updated results mysql-test/suite/jp/r/jp_subquery_ucs2.result: Updated results mysql-test/suite/jp/r/jp_subquery_ujis.result: Updated results mysql-test/suite/jp/r/jp_subquery_utf8.result: Updated results mysql-test/suite/jp/r/jp_substring_sjis.result: Updated results mysql-test/suite/jp/r/jp_substring_ucs2.result: Updated results mysql-test/suite/jp/r/jp_substring_ujis.result: Updated results mysql-test/suite/jp/r/jp_substring_utf8.result: Updated results mysql-test/suite/jp/r/jp_trim_sjis.result: Updated results mysql-test/suite/jp/r/jp_trim_ucs2.result: Updated results mysql-test/suite/jp/r/jp_trim_ujis.result: Updated results mysql-test/suite/jp/r/jp_trim_utf8.result: Updated results mysql-test/suite/jp/r/jp_union_ujis.result: Updated results mysql-test/suite/jp/r/jp_update_sjis.result: Updated results mysql-test/suite/jp/r/jp_update_ucs2.result: Updated results mysql-test/suite/jp/r/jp_update_ujis.result: Updated results mysql-test/suite/jp/r/jp_update_utf8.result: Updated results mysql-test/suite/jp/r/jp_where_sjis.result: Updated results mysql-test/suite/jp/r/jp_where_ucs2.result: Updated results mysql-test/suite/jp/r/jp_where_ujis.result: Updated results mysql-test/suite/jp/r/jp_where_utf8.result: Updated results mysql-test/suite/jp/t/jp_alter_sjis.test: Updated results mysql-test/suite/jp/t/jp_alter_ucs2.test: Updated results mysql-test/suite/jp/t/jp_alter_ujis.test: Updated results mysql-test/suite/jp/t/jp_alter_utf8.test: Updated results mysql-test/suite/jp/t/jp_charlength_sjis.test: Updated results mysql-test/suite/jp/t/jp_charlength_ucs2.test: Updated results mysql-test/suite/jp/t/jp_charlength_ujis.test: Updated results mysql-test/suite/jp/t/jp_charlength_utf8.test: Updated results mysql-test/suite/jp/t/jp_charset_sjis.test: Updated results mysql-test/suite/jp/t/jp_charset_ucs2.test: Updated results mysql-test/suite/jp/t/jp_charset_ujis.test: Updated results mysql-test/suite/jp/t/jp_charset_utf8.test: Updated results mysql-test/suite/jp/t/jp_convert_sjis.test: Updated results mysql-test/suite/jp/t/jp_convert_ucs2.test: Updated results mysql-test/suite/jp/t/jp_convert_ujis.test: Updated results mysql-test/suite/jp/t/jp_convert_utf8.test: Updated results mysql-test/suite/jp/t/jp_create_db_sjis.test: Updated results mysql-test/suite/jp/t/jp_create_db_utf8.test: Updated results mysql-test/suite/jp/t/jp_create_tbl_sjis.test: Updated results mysql-test/suite/jp/t/jp_create_tbl_ucs2.test: Updated results mysql-test/suite/jp/t/jp_create_tbl_ujis.test: Updated results mysql-test/suite/jp/t/jp_create_tbl_utf8.test: Updated results mysql-test/suite/jp/t/jp_enum_sjis.test: Updated results mysql-test/suite/jp/t/jp_enum_ucs2.test: Updated results mysql-test/suite/jp/t/jp_enum_ujis.test: Updated results mysql-test/suite/jp/t/jp_enum_utf8.test: Updated results mysql-test/suite/jp/t/jp_insert_sjis.test: Updated results mysql-test/suite/jp/t/jp_insert_ucs2.test: Updated results mysql-test/suite/jp/t/jp_insert_ujis.test: Updated results mysql-test/suite/jp/t/jp_insert_utf8.test: Updated results mysql-test/suite/jp/t/jp_instr_sjis.test: Updated results mysql-test/suite/jp/t/jp_instr_ucs2.test: Updated results mysql-test/suite/jp/t/jp_instr_ujis.test: Updated results mysql-test/suite/jp/t/jp_instr_utf8.test: Updated results mysql-test/suite/jp/t/jp_join_sjis.test: Updated results mysql-test/suite/jp/t/jp_join_ucs2.test: Updated results mysql-test/suite/jp/t/jp_join_ujis.test: Updated results mysql-test/suite/jp/t/jp_join_utf8.test: Updated results mysql-test/suite/jp/t/jp_left_sjis.test: Updated results mysql-test/suite/jp/t/jp_left_ucs2.test: Updated results mysql-test/suite/jp/t/jp_left_ujis.test: Updated results mysql-test/suite/jp/t/jp_left_utf8.test: Updated results mysql-test/suite/jp/t/jp_length_sjis.test: Updated results mysql-test/suite/jp/t/jp_length_ucs2.test: Updated results mysql-test/suite/jp/t/jp_length_ujis.test: Updated results mysql-test/suite/jp/t/jp_length_utf8.test: Updated results mysql-test/suite/jp/t/jp_like_sjis.test: Updated results mysql-test/suite/jp/t/jp_like_ucs2.test: Updated results mysql-test/suite/jp/t/jp_like_ujis.test: Updated results mysql-test/suite/jp/t/jp_like_utf8.test: Updated results mysql-test/suite/jp/t/jp_locate_sjis.test: Updated results mysql-test/suite/jp/t/jp_locate_ucs2.test: Updated results mysql-test/suite/jp/t/jp_locate_ujis.test: Updated results mysql-test/suite/jp/t/jp_locate_utf8.test: Updated results mysql-test/suite/jp/t/jp_lpad_sjis.test: Updated results mysql-test/suite/jp/t/jp_lpad_ucs2.test: Updated results mysql-test/suite/jp/t/jp_lpad_ujis.test: Updated results mysql-test/suite/jp/t/jp_lpad_utf8.test: Updated results mysql-test/suite/jp/t/jp_ltrim_sjis.test: Updated results mysql-test/suite/jp/t/jp_ltrim_ucs2.test: Updated results mysql-test/suite/jp/t/jp_ltrim_ujis.test: Updated results mysql-test/suite/jp/t/jp_ltrim_utf8.test: Updated results mysql-test/suite/jp/t/jp_ps_sjis.test: Updated results mysql-test/suite/jp/t/jp_ps_ujis.test: Updated results mysql-test/suite/jp/t/jp_replace_sjis.test: Updated results mysql-test/suite/jp/t/jp_replace_ucs2.test: Updated results mysql-test/suite/jp/t/jp_replace_ujis.test: Updated results mysql-test/suite/jp/t/jp_replace_utf8.test: Updated results mysql-test/suite/jp/t/jp_reverse_sjis.test: Updated results mysql-test/suite/jp/t/jp_reverse_ucs2.test: Updated results mysql-test/suite/jp/t/jp_reverse_ujis.test: Updated results mysql-test/suite/jp/t/jp_reverse_utf8.test: Updated results mysql-test/suite/jp/t/jp_right_sjis.test: Updated results mysql-test/suite/jp/t/jp_right_ucs2.test: Updated results mysql-test/suite/jp/t/jp_right_ujis.test: Updated results mysql-test/suite/jp/t/jp_right_utf8.test: Updated results mysql-test/suite/jp/t/jp_rpad_sjis.test: Updated results mysql-test/suite/jp/t/jp_rpad_ucs2.test: Updated results mysql-test/suite/jp/t/jp_rpad_ujis.test: Updated results mysql-test/suite/jp/t/jp_rpad_utf8.test: Updated results mysql-test/suite/jp/t/jp_rtrim_sjis.test: Updated results mysql-test/suite/jp/t/jp_rtrim_ucs2.test: Updated results mysql-test/suite/jp/t/jp_rtrim_ujis.test: Updated results mysql-test/suite/jp/t/jp_rtrim_utf8.test: Updated results mysql-test/suite/jp/t/jp_select_sjis.test: Updated results mysql-test/suite/jp/t/jp_select_ucs2.test: Updated results mysql-test/suite/jp/t/jp_select_ujis.test: Updated results mysql-test/suite/jp/t/jp_select_utf8.test: Updated results mysql-test/suite/jp/t/jp_subquery_sjis.test: Updated results mysql-test/suite/jp/t/jp_subquery_ucs2.test: Updated results mysql-test/suite/jp/t/jp_subquery_ujis.test: Updated results mysql-test/suite/jp/t/jp_subquery_utf8.test: Updated results mysql-test/suite/jp/t/jp_substring_sjis.test: Updated results mysql-test/suite/jp/t/jp_substring_ucs2.test: Updated results mysql-test/suite/jp/t/jp_substring_ujis.test: Updated results mysql-test/suite/jp/t/jp_substring_utf8.test: Updated results mysql-test/suite/jp/t/jp_trim_sjis.test: Updated results mysql-test/suite/jp/t/jp_trim_ucs2.test: Updated results mysql-test/suite/jp/t/jp_trim_ujis.test: Updated results mysql-test/suite/jp/t/jp_trim_utf8.test: Updated results mysql-test/suite/jp/t/jp_union_ujis.test: Updated results mysql-test/suite/jp/t/jp_update_sjis.test: Updated results mysql-test/suite/jp/t/jp_update_ucs2.test: Updated results mysql-test/suite/jp/t/jp_update_ujis.test: Updated results mysql-test/suite/jp/t/jp_update_utf8.test: Updated results mysql-test/suite/jp/t/jp_where_sjis.test: Updated results mysql-test/suite/jp/t/jp_where_ucs2.test: Updated results mysql-test/suite/jp/t/jp_where_ujis.test: Updated results mysql-test/suite/jp/t/jp_where_utf8.test: Updated results mysql-test/suite/jp/include/trim_sjis.inc: Auxiliary script mysql-test/suite/jp/t/disabled.def: Disable tests which suffer to an unacceptable extend from bug 36597 Testsuite "jp": Suspicious results for some tests -
unknown authored
Problem: If INSERT is immediately followed by SELECT in another thread, the newly inserted rows may not be returned by the SELECT statement, if ENGINE=myisam and @@concurrent_insert=1. This caused sporadic errors in rpl_insert_id. Fix: The test now uses ENGINE=$engine_type when creating tables (so that innodb is used). It also turns off @@concurrent_insert around the critical place, so that it works if someone in the future writes a test that sets $engine_type=myisam before sourcing extra/rpl_tests/rpl_insert_id.test. It also adds ORDER BY to all SELECTs so that the result is deterministic. mysql-test/extra/rpl_tests/rpl_insert_id.test: - Use ENGINE=$engine_type when creating tables, since that's expected by suite/rpl/t/rpl_insert_id.test. - Use ORDER BY to avoid nondeterministic results from SELECT. - Set @@concurrent_insert=0 before doing SELECT after INSERT in another client. mysql-test/suite/rpl/r/rpl_insert_id.result: Update result file.
-
unknown authored
-
- 14 May, 2008 10 commits
-
-
unknown authored
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam mysql-test/t/disabled.def: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged mysql-test/suite/funcs_1/r/myisam_views.result: merge of 5.1 to 5.1-bugteam
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam mysql-test/t/disabled.def: Auto merged
-
unknown authored
into noir.wlan.koehntopp.de:/misc/mysql/3/51-3 mysql-test/r/mix2_myisam.result: Auto merged mysql-test/t/disabled.def: manual merge
-
unknown authored
temporary mass-disable of affected tests mysql-test/t/disabled.def: temporary mass-disable of problematic tests
-
unknown authored
"Apply InnoDB snapshot innodb-5.1-ss2438. Addresses the following bugs: Change the fix for Bug#32440 to show bytes instead of kilobytes in INFORMATION_SCHEMA.TABLES.DATA_FREE. branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected In InnoDB, the row count is only a rough estimate used by SQL optimization. InnoDB is now return row count 0 for TRUNCATE operation. branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update and handler_delete Add the calls to ha_statistic_increment() in ha_innobase::delete_row() and ha_innobase::update_row(). Fix Bug#36169 create innodb compressed table with too large row size crash Sometimes it is possible that row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in row_create_index_for_mysql() when the index object is freed so copy the table name to a safe place beforehand and use the copy. Fix Bug#36434 ha_innodb.so is installed in the wrong directory Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been forgotten in this commit: http://lists.mysql.com/commits/40206" mysql-test/r/innodb.result: revert InnoDB snapshot innodb-5.1-ss2438 mysql-test/r/mix2_myisam.result: merge-fixes: undoing previous unspecified post-merge fixes by kaa a/o 2008/2/13 (1.7) mysql-test/t/innodb.test: revert InnoDB snapshot innodb-5.1-ss2438 storage/innobase/Makefile.am: revert InnoDB snapshot innodb-5.1-ss2438 storage/innobase/handler/ha_innodb.cc: revert InnoDB snapshot innodb-5.1-ss2438 storage/innobase/plug.in: revert InnoDB snapshot innodb-5.1-ss2438 storage/innobase/row/row0mysql.c: revert InnoDB snapshot innodb-5.1-ss2438 storage/innobase/row/row0sel.c: revert InnoDB snapshot innodb-5.1-ss2438
-
- 13 May, 2008 16 commits
-
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam
-
unknown authored
into host.loc:/work/bk/5.1-bugteam
-
unknown authored
max_heap_table_size_basic_32, query_cache_size_basic_32 and tmp_table_size_basic_32 tests have been disabled according to bug #36522. mysql-test/t/disabled.def: max_heap_table_size_basic_32, query_cache_size_basic_32 and tmp_table_size_basic_32 tests have been disabled according to bug #36522.
-
unknown authored
subselects into account It is forbidden to use the SELECT INTO construction inside UNION statements unless on the last SELECT of the union. The parser records whether it has seen INTO or not when parsing a UNION statement. But if the INTO was legally used in an outer query, an error is thrown if UNION is seen in a subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and mitigate the error unless it collides with the UNION. mysql-test/r/union.result: Bug#32858: Test result mysql-test/t/union.test: Bug#32858: Test case sql/sql_class.cc: Bug#32858: Initializing new member sql/sql_class.h: Bug#32858: Added property nest_level to select_result class. sql/sql_yacc.yy: Bug#32858: The fix.
-
unknown authored
Post-push test case update (bug #30059). mysql-test/r/mix2_myisam.result: Post-push test case update (bug #30059).
-
unknown authored
FLUSH STATUS doesn't clear the values of the global status variables. The test case is reduced to testing session local Com-variables until FLUSH GLOBAL STATUS is implemented. mysql-test/r/status.result: Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is implemented. mysql-test/t/disabled.def: Enable main.status.test. mysql-test/t/status.test: Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is implemented.
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.1 BUILD/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/std_data/funcs_1/innodb_tb1.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb2.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb3.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb4.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb1.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb2.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb3.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb4.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb1.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb2.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb3.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb4.txt: Auto merged mysql-test/std_data/funcs_1/t3.txt: Auto merged mysql-test/std_data/funcs_1/t4.txt: Auto merged mysql-test/std_data/funcs_1/t7.txt: Auto merged mysql-test/std_data/funcs_1/t9.txt: Auto merged mysql-test/suite/funcs_1/README.txt: Auto merged mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc: Auto merged mysql-test/suite/funcs_1/datadict/datadict_load.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/sp_tb.inc: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_innodb.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_memory.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_myisam.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_ndb.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_03.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Auto merged mysql-test/suite/funcs_1/t/innodb_trig_0407.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/triggers/trig_frkey2.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_03.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_08.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_09.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Auto merged mysql-test/suite/funcs_1/views/func_view.inc: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0-release-merge BUILD/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/std_data/funcs_1/innodb_tb1.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb2.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb3.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb4.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb1.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb2.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb3.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb4.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb1.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb2.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb3.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb4.txt: Auto merged mysql-test/std_data/funcs_1/t3.txt: Auto merged mysql-test/std_data/funcs_1/t4.txt: Auto merged mysql-test/std_data/funcs_1/t7.txt: Auto merged mysql-test/std_data/funcs_1/t9.txt: Auto merged mysql-test/suite/funcs_1/README.txt: Auto merged mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc: Auto merged mysql-test/suite/funcs_1/datadict/datadict_load.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/sp_tb.inc: Auto merged mysql-test/suite/funcs_1/r/innodb_func_view.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_innodb.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_memory.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_myisam.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_ndb.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_innodb.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_memory.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_myisam.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_ndb.result: Auto merged mysql-test/suite/funcs_1/r/memory_func_view.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam_func_view.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/myisam_views.result: Auto merged mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_03.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Auto merged mysql-test/suite/funcs_1/t/innodb_trig_0407.test: Auto merged mysql-test/suite/funcs_1/t/is_basics_mixed.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/triggers/trig_frkey2.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_03.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_08.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_09.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Auto merged mysql-test/suite/funcs_1/views/func_view.inc: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged BitKeeper/deleted/.del-load_file.txt: Delete: mysql-test/std_data/funcs_1/load_file.txt
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam
-
unknown authored
-
unknown authored
into host.loc:/work/bk/5.1-bugteam
-
unknown authored
into host.loc:/work/bk/5.1-bugteam
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
-
unknown authored
Fixed build failure depending on events in embedded build. mysql-test/r/create.result: Moved test with events to another test file sine embedded build doesn't support event scheduler. mysql-test/r/events_2.result: Moved test with events to another test file sine embedded build doesn't support event scheduler. mysql-test/r/sp.result: Removed 'show privileges' from test as result is depending on if event sheduler is built in. mysql-test/t/create.test: Moved test with events to another test file sine embedded build doesn't support event scheduler. mysql-test/t/events_2.test: Moved test with events to another test file sine embedded build doesn't support event scheduler. mysql-test/t/sp.test: Removed 'show privileges' from test as result is depending on if event sheduler is built in.
-
unknown authored
into host.loc:/work/bk/5.1-bugteam mysql-test/r/heap.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_binary.result: Auto merged mysql-test/r/warnings.result: Auto merged BitKeeper/deleted/.del-bdb.result: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged
-
unknown authored
into host.loc:/work/bk/5.0-bugteam
-
- 12 May, 2008 7 commits
-
-
unknown authored
into host.loc:/work/bk/5.1-bugteam
-
unknown authored
into host.loc:/work/bk/5.1-bugteam sql/handler.cc: Auto merged mysql-test/r/repair.result: Merge with 5.0-bugteam (bug#36055). mysql-test/t/repair.test: Merge with 5.0-bugteam (bug#36055). sql/sql_table.cc: Merge with 5.0-bugteam (bug#36055).
-
unknown authored
into host.loc:/work/bk/5.0-bugteam
-
unknown authored
into mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
-
unknown authored
When flushing tables, there were a slight chance that the flush was occuring between processing of two table map events. Since the tables are opened one by one, it might result in that the tables were not valid and that sub- sequent locking of tables would cause the slave to crash. The problem is solved by opening and locking all tables at once using simple_open_n_lock_tables(). Also, the patch contain a change to open_tables() so that pre-locking only takes place when the trg_event_map is not zero, which was not the case before (this caused the lock to be placed in thd->locked_tables instead of thd->lock since the assumption was that triggers would be called later and therefore the tables should be pre-locked). mysql-test/suite/rpl/r/rpl_found_rows.result: Result change mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result: Result change mysql-test/suite/rpl/t/rpl_found_rows.test: Adding drop of table that was created in test. mysql-test/suite/rpl/t/rpl_slave_status.test: Adding waits for slave start and stop to ensure that test works. sql/log_event.cc: Replacing table-by-table open and lock with a single call to simple_open_n_lock_tables(), which in turn required some changes to other code. sql/log_event_old.cc: Replacing table-by-table open and lock with a single call to simple_open_n_lock_tables(), which in turn required some changes to other code. sql/sql_base.cc: Extending check inside open_tables() so that pre-locking in only done if tables->trg_egent_map is non-zero. mysql-test/include/wait_for_slave_sql_to_start.inc: New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_start.inc''
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/fixes-5.1-bugteam
-
unknown authored
-
