summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Fix for maria.test failure in embedded server (test split)unknown2008-02-154-42/+58
| | | | | | | | | | | | | mysql-test/r/maria.result: result update mysql-test/t/maria.test: The embedded server translates INSERT DELAYED to plain INSERT so does not produce an error; moving this test to a new test which is not run for the embedded server. mysql-test/r/maria_notembedded.result: result is ok mysql-test/t/maria_notembedded.test: New test for cases where embedded server is different.
* Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-02-131-0/+1
|\ | | | | | | | | | | | | into mysql.com:/home/my/mysql-maria
| * Fixed compiler warnings in a lot of filesunknown2008-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined client/get_password.c: Fixed compiler warning cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning by adding marco to be used when largest_char is 255 cmd-line-utils/readline/display.c: Fixed compiler warnings by removing not accessed variables cmd-line-utils/readline/histexpand.c: Fixed compiler warnings by removing not accessed variables cmd-line-utils/readline/history.c: Fixed compiler warnings by adding cast cmd-line-utils/readline/text.c: Fixed compiler warnings by removing not accessed variables and adding casts dbug/dbug.c: Fixed compiler warnings by changing types include/mysql_com.h: Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value libmysql/libmysql.c: Fixed compiler warning mysql-test/t/query_cache_debug.test: Mark test as BIG as it uses a lot of memory mysys/mf_iocache2.c: Fixed compiler warnings by adding cast sql/event_data_objects.cc: Fixed compiler warnings by removing not used code sql/events.cc: Fixed compiler warnings by removing not used code sql/field.cc: Fixed compiler warnings by adding cast and removed not accessed variables sql/ha_partition.cc: Fixed compiler warnings by removing not used code sql/item.cc: Fixed compiler warnings by removing not accessed variables Use IMPOSSIBLE_RESULT instead of (Item_result)-1 sql/item_cmpfunc.cc: Fixed compiler warnings by removing not accessed variables sql/item_func.cc: Fixed compiler warnings by removing not used code and not accessed variables Added IMPOSSIBLE_RESULT sql/item_subselect.cc: Fixed compiler warnings by removing not accessed variables sql/item_xmlfunc.cc: Fixed forgotten setting of xpath->error sql/log.cc: Fixed compiler warnings by removing not accessed variables sql/log_event.cc: Added IMPOSSIBLE_RESULT into switch Fixed wrong usage of DBUG_ASSERT(1) Removed always true DBUG_ASSERT() sql/mysqld.cc: Fixed compiler warnings by adding casts for ULONG_MAX sql/opt_sum.cc: Fixed compiler warnings by removing not used code Removed wrong DBUG_ASSERT() sql/partition_info.cc: Fixed compiler warnings by removing not accessed variables sql/rpl_injector.h: Removed always true part from DBUG_ASSERT() to remove compiler warning sql/spatial.cc: Fixed compiler warnings by removing not accessed variables sql/sql_acl.cc: Fixed compiler warnings by removing not accessed variables sql/sql_base.cc: Fixed compiler warnings by removing not accessed variables sql/sql_cache.cc: Fixed compiler warnings by removing not accessed variables sql/sql_class.cc: Fixed compiler warnings by: - Removing always true part from DBUG_ASSERT() - Removing not used code - Added IMPOSSIBLE_RESULT into switch sql/sql_load.cc: Fixed compiler warnings by removing not accessed variables sql/sql_parse.cc: Fixed compiler warnings by: - Removing not accessed variables - Removing always true part from DBUG_ASSERT() - Removing not used code sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Fixed compiler warnings by removing not accessed variables sql/sql_show.cc: Fixed compiler warnings by using correct cast sql/sql_table.cc: Fixed compiler warnings by removing not used code and removing not accessed variables sql/table.cc: Fixed compiler warnings by removing not accessed variables sql/time.cc: Fixed wrong DBUG_ASSERT(1) storage/maria/unittest/Makefile.am: Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined storage/maria/unittest/ma_pagecache_consist.c: Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined storage/maria/unittest/ma_pagecache_single.c: Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined tests/mysql_client_test.c: Fixed compiler warnings by removing not accessed variables and changing types
* | fix for embedded buildunknown2008-02-131-1/+1
|/
* Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-02-114-1/+69
|\ | | | | | | | | | | | | into mysql.com:/home/my/mysql-maria
| * Add warning of TRANSACTIONAL=1 is used with handler that doesn't support itunknown2008-02-114-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added hton_name() and handler->engine_name() and use these when appropriate KNOWN_BUGS.txt: Added some of the known bugs mysql-test/r/maria.result: Added test for TRANSACTIONAL=1 mysql-test/r/myisam.result: Added test for TRANSACTIONAL=1 mysql-test/t/maria.test: Added test for TRANSACTIONAL=1 mysql-test/t/myisam.test: Added test for TRANSACTIONAL=1 sql/handler.cc: ha_resolve_storage_engine_name() -> hton_name() sql/handler.h: Added hton_name() and handler->engine_name() sql/set_var.cc: Use hton_name() sql/sql_table.cc: Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it Indentation fixes ha_resolve_storage_engine_name() -> hton_name() sql/sql_tablespace.cc: ha_resolve_storage_engine_name() -> hton_name() Indentation fixes sql/sql_yacc.yy: ha_resolve_storage_engine_name() -> hton_name() sql/unireg.cc: ha_resolve_storage_engine_name() -> hton_name() Indentation fixes
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2008-02-1124-51/+168
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-maria mysql-test/mysql-test-run.pl: Auto merged sql/log_event.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/share/errmsg.txt: Auto merged include/my_base.h: merged
| * Problem: pushbuild has sporadic errors during startup ofunknown2008-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | rpl_ndb_rep_ignore Reason: previous test, rpl_ndb_2multi_eng, does not sync slave with master after cleanup, so tables are sometimes left on slave Fix: sync_slave_with_master mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test: Wait until drop table is replicated to slave before terminating. (The extra table caused sporadic errors in the next test case, causing pushbuild to fail.)
| * Problem: pushbuild fails in embedded mode on test binlog_base64_flagunknown2008-02-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | because it uses BINLOG statement, which is not supported in embedded mode. Fix: disable the test in embedded mode. mysql-test/suite/binlog/t/binlog_base64_flag.test: Must disable this test when running embedded, since BINLOG statements don't work. This fixes the pushbuild problem on the debx86-b machine on https://intranet.mysql.com/secure/pushbuild/showpush.pl?dir=mysql-5.1-new-rpl&order=469
| * BUG#33247: mysqlbinlog does not clean up after itself on abnormal terminationunknown2008-02-084-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: mysqlbinlog does not free memory if an error happens. Fix: binlog-processing functions do not call exit() anymore. Instead, they print an error and return an error code. Error codes are propagated all the way back to main, and all allocated memory is freed on the way. client/mysqlbinlog.cc: - New error handling policy: functions processing binlogs don't just exit() anymore. Instead, they print a message and return an error status. - New policy for the global `mysql' and `glob_description_event': these are not passed as parameters anymore. The global pointer is used instead. - More error situations are detected and reported. - Better error messages: the program never terminates with exit status 1 without explanation any more. Fixed spelling errors. Use consistent format of messages (a single line beginning with "ERROR: " or "WARNING: " and ending with "." is printed to stderr.) - New memory handling: memory is always freed on program termination. - Better comments: more functions are explained, doxygen is used, and more precise formulations in some existing comments. mysql-test/suite/binlog/r/binlog_base64_flag.result: Result file updated since output format of mysqlbinlog changed while the test was disabled. mysql-test/suite/binlog/t/binlog_killed.test: Mysqlbinlog now works as described when the binlog is open. Hence, the --force-if-open flag must be passed mysql-test/suite/binlog/t/binlog_killed_simulate.test: Mysqlbinlog now works as described when the binlog is open. Hence, the --force-if-open flag must be passed mysql-test/suite/binlog/t/disabled.def: Now that mysqlbinlog cleans up after itself on abnormal termination, we can enable this test again.
| * Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-02-078-8/+8
| |\ | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl mysql-test/suite/binlog/t/binlog_old_versions.test: Auto merged
| | * Renaming some saved binary log files to avoid 99 charactersunknown2008-02-078-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | limit for v7 tar. mysql-test/suite/binlog/std_data/ver_5_1_17.001: Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_17.001 mysql-test/suite/binlog/std_data/ver_5_1_23.001: Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_23.001 mysql-test/suite/binlog/std_data/ver_5_1-telco.001: Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-telco.001 mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001: Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001 mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001: Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001 mysql-test/suite/binlog/std_data/bug32407.001: Rename: mysql-test/suite/binlog/std_data/binlog-bug32407.000001 -> mysql-test/suite/binlog/std_data/bug32407.001
| * | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-02-071-8/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl sql/slave.cc: Auto merged sql/sql_binlog.cc: Auto merged
| | * Removing duplicate code from mysql-test-run.plunknown2008-02-061-8/+0
| | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Removing duplicate code.
| * | Updating result file for rpl_loaddata_map.unknown2008-02-051-5/+5
| | | | | | | | | | | | | | | mysql-test/suite/rpl/r/rpl_loaddata_map.result: Result change.
| * | Fixes to make tests pass on vanilla build.unknown2008-02-051-1/+1
| | | | | | | | | | | | | | | mysql-test/suite/binlog/t/binlog_old_versions.test: Adding --local-load to 'mysqlbinlog' and --local-infile=1 to 'mysql'.
| * | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2008-02-0511-23/+139
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl include/my_base.h: Auto merged mysql-test/include/show_binlog_events2.inc: Auto merged mysql-test/suite/binlog/t/binlog_old_versions.test: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt: Auto merged mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt: Auto merged sql/log_event_old.cc: Auto merged sql/sql_binlog.cc: Auto merged mysql-test/suite/rpl/r/rpl_loaddata_map.result: Manual merge. mysql-test/suite/rpl/r/rpl_user.result: Manual merge. mysql-test/suite/rpl/t/rpl_loaddata_map.test: Manual merge. mysql-test/suite/rpl/t/rpl_user.test: Manual merge. sql/log_event.cc: Manual merge. sql/rpl_record.cc: Manual merge.
| | * Merge riska.(none):/home/sven/bktip/5.1-new-rplunknown2008-02-043-0/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into riska.(none):/home/sven/bk/b34141-mysqlbinlog_4.1_binlogs/5.1-new-rpl sql/log_event.cc: Auto merged sql/log_event.h: Auto merged
| | | * BUG#34141: mysqlbinlog cannot read 4.1 binlogs containing load data infileunknown2008-01-303-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main problem: mysql 5.1 cannot read binlogs from 4.1. Subproblem 1: There is a mistake in sql_ex_info::init. The read_str() function updates its first argument to point to the next character to read. However, it is applied only to a copy of the buffer pointer, so the real buffer pointer is not updated. Fix 1: do not take a copy of the buffer pointer. The copy was needed because sql_ex_info::init does not use the const attribute on some of its arguments. So we add the const attribute, too. Subproblem 2: The first BINLOG statement is asserted to be a FORMAT_DESCRIPTION_LOG_EVENT, but 4.1 binlogs begin with START_EVENT_V3. Fix 2: allow START_EVENT_V3 too. mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001: New BitKeeper file ``mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001'' mysql-test/suite/binlog/r/binlog_old_versions.result: Updated result file. mysql-test/suite/binlog/t/binlog_old_versions.test: Added a test reading an old 4.1 binlog. sql/log_event.cc: 1. Added const keyword at the following places: - input buffer for pretty_print_str - input buffer for write_str - input buffer, end pointer, and return value from sql_ex_info::init 2. Fixed the bug by not taking a copy of buf before calling read_str in sql_ex_info::init(). sql/log_event.h: Added const keyword to fields of the sql_ex_info struct. Added const keyword to arguments and return value of sql_ex_info::init sql/sql_binlog.cc: The first BINLOG statement must describe the format for future BINLOG statements. Otherwise, we do not know how to read the BINLOG statement. Problem: only FORMAT_DESCRIPTION_EVENT is currently allowed as the first event. Binlogs from 4.1 begin with a START_EVENT_V3, which serves the same purpose. Fix: We now allow the first BINLOG statement to be a START_EVENT_V3, as well as a FORMAT_DESCRIPTION_EVENT.
| | * | Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2008-02-016-19/+109
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug33862_failed_drop_user/5.1 mysql-test/include/show_binlog_events2.inc: Auto merged
| | | * | failure in 5.1 tree for rpl_server_id caused by the wrong offset inunknown2008-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the include file. fixed with correcting the offset. mysql-test/include/show_binlog_events2.inc: correcting 5.1 specific offset (which appeared to 5.0's)
| | | * | bug#32971 manual merge of two tests resultsunknown2008-01-312-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: manual merge mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: manual merge
| | | * | Merge ↵unknown2008-01-311-3/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error_propag_slave into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug32971-rbr_error_prop mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: manual merge use local mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: manual merge use local
| | | | * | Bug #32971 No user level error message from slave sql thread when ↵unknown2008-01-313-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ER_NO_DEFAULT_FOR_FIELD The error message due to lack of the default value for an extra field was not as informative as it should be. Fixed with improving the scheme of gathering, propagating and reporting errors in applying rows events. The scheme is in the following. Any kind of error of processing of a row event incidents are to be registered with my_error(). In the end Rows_log_event::do_apply_event() invokes rli->report() with the message to display consisting of all the errors. This mimics `show warnings' displaying. A simple test checks three errors in processing an event. Two hunks - a user level error and pushing it into the list - have been devoted to already fixed Bug@31702. Some open issues relating to this artifact listed on BUG@21842 page and on WL@3679. Todo: to synchronize the statement in the tests comments on Update and Delete events may not stop when an extra field does not have a default with wl@3228 spec. include/my_base.h: A new handler level error code that is supposed to be mapped to a set of more specific ER_ user level errors. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Adding yet another extra fields to see more than one error in show slave status' report. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: results changed (the error message etc) mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: results changed sql/log_event.cc: Refining slave_rows_error_report to iterate on the list of gathered errors; Simplifying signature of prepare_record as the function does not call rli->report to leave that duty to the event's top level code. sql/log_event.h: adding a corrupt event error pushing. The error will be seen with show slave status. sql/log_event_old.cc: similar to log_event.cc changes sql/rpl_record.cc: prepare_record only pushes an error to the list sql/rpl_record.h: signature changed sql/share/errmsg.txt: The user level error code that corresponds to HA_ERR_CORRUPT_EVENT. The error will be reported in show slave status if such a failure happens.
| | | * | | Test case for bug#12691unknown2008-01-313-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/bugs/data/rpl_bug12691.dat: Data file for test case mysql-test/suite/bugs/r/rpl_bug12691.result: Result file
| | * | | | Post merge fixunknown2008-01-318-42/+48
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt: Rename: mysql-test/t/rpl_loaddata_map-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt: Rename: mysql-test/t/rpl_loaddata_map-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt
* | | | | don't disable debug if there's nothing to disableunknown2008-02-061-1/+1
| | | | |
* | | | | after-mergeunknown2008-02-067-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *correct* disabling of dbug in mysql-test-run include/atomic/gcc_builtins.h: after-merge mysql-test/lib/mtr_report.pl: after-merge mysql-test/mysql-test-run.pl: *correct* disabling of dbug in mysql-test-run mysql-test/r/ps_maria.result: after-merge mysql-test/t/crash_commit_before-master.opt: *correct* disabling of dbug in mysql-test-run mysql-test/t/maria-recovery-big-master.opt: *correct* disabling of dbug in mysql-test-run mysql-test/t/maria-recovery-bitmap-master.opt: *correct* disabling of dbug in mysql-test-run mysql-test/t/maria-recovery-master.opt: *correct* disabling of dbug in mysql-test-run sql/mysqld.cc: --disable-debug
* | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-05219-962/+20735
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-maria include/my_sys.h: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/suite/binlog/r/binlog_unsafe.result: Auto merged mysql-test/suite/binlog/t/binlog_unsafe.test: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Auto merged mysql-test/suite/rpl/t/rpl_insert.test: Auto merged mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/view.test: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/unireg.cc: Auto merged sql/share/errmsg.txt: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged sql/log_event_old.h: SCCS merged BitKeeper/triggers/post-commit: merged client/mysqldump.c: merged configure.in: merged client/mysqltest.c: merged include/Makefile.am: merged include/atomic/nolock.h: merged mysql-test/lib/mtr_report.pl: merged sql/handler.h: merged sql/mysqld.cc: merged sql/sql_select.cc: merged
| * | | | Adding some more filtering for tests that kills queries andunknown2008-02-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause sporadic, but benign, errors. mysql-test/lib/mtr_report.pl: Filtering out sporadic but benign error in rpl_err_ignoredtable.
| * | | | Disabling test case binlog_old_version for embedded server.unknown2008-02-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_report.pl: Ignoring benign error message (killing query causes unpredictable error messages). mysql-test/suite/binlog/t/binlog_old_versions.test: Disabling test case for embedded server. sql/rpl_rli.cc: Inititializing uninitialized variable causing valgrind warning.
| * | | | Fixing result change after merge.unknown2008-02-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/rpl/r/rpl_user.result: Result change.
| * | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-mergeunknown2008-02-041-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/suite/rpl/t/rpl_user.test: Manual merging.
| | * | | | Fixes to make rpl_user test pass in pushbuild.unknown2008-02-041-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/rpl_user.test: Removing redundant reset master and deleting users from master and slave without using binary log.
| * | | | | More fixes to remove test failures in pushbuild.unknown2008-02-042-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/rpl/r/rpl_row_trig001.result: Result change. mysql-test/suite/rpl/t/rpl_row_trig001.test: Correcting a typo and trying to avoid a race condition when dumping the contents of the master and slave for comparison.
| * | | | | Yet more changes to fix the merge clone.unknown2008-02-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/rpl/t/rpl_idempotency.test: Adding "have_innodb.inc" since the test reqires InnoDB.
| * | | | | Masking out some more errors and warnings that are benign.unknown2008-02-042-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/include/delete_anonymous_users.inc: Disabling warnings. mysql-test/lib/mtr_report.pl: Masking out benign errors and warnings from var/log/warnings file.
| * | | | | Minor fix to make rpl_loaddata_map pass without warnings.unknown2008-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt: Correcting read_buffer_size to be a multiple of 4KiB since a warning is generated otherwise.
| * | | | | Removing expected errors from slave from the warnings file.unknown2008-02-031-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_report.pl: Removing some expected warnings and errors from the slave for tests rpl_idempotency and rpl_skip_error.
| * | | | | Bug #34244 Test ndb_binlog_log_bin fails for 'drop table ifunknown2008-02-033-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exists t1,t2,t3' Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE' Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create 'mysql/ndb_apply_status' Tests cases didn't wait for cluster to come up due to a typo in have_multi_ndb.inc. mysql-test/include/have_multi_ndb.inc: SHOW TABLES is case-sensitive in the pattern to LIKE. mysql-test/suite/ndb/t/disabled.def: Enabling tests. mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test: Adding include of have_debug since test requires that. sql/sql_repl.cc: Replacing 'return' with 'DBUG_RETURN' in debug-traced function.
| * | | | | Disabling various tests and reporting bugs for them.unknown2008-02-022-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/ndb/t/disabled.def: Disabling tests ndb_binlog_lob_bin, ndb_binlog_multi, and rpl_ndb_transaction. mysql-test/suite/parts/t/disabled.def: Disabling various partition tests.
| * | | | | Fixes to make tests pass in pushbuild.unknown2008-02-012-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Result change. mysql-test/suite/binlog/t/binlog_start_comment.test: Removing --short-form since that cause test to fail.
| * | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-mergeunknown2008-02-012-8/+19
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/t/mysqlbinlog.test: SCCS merged
| | * | | | Again blanking out some numbers in file names that is dependentunknown2008-02-012-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the context. mysql-test/r/mysqlbinlog.result: Result file change. mysql-test/t/mysqlbinlog.test: Blanking out yet some numbers in file names.
| * | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-mergeunknown2008-02-012-4/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged
| | * | | | Fixes to make tests pass in pushbuild.unknown2008-02-012-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/mysqlbinlog.result: Result file change. mysql-test/t/mysqlbinlog.test: Fixing test to not be dependent on the sequence numbers for file names generated by mysqlbinlog.
| * | | | | Fixes to makes tests pass on Windows and vanilla build.unknown2008-02-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/binlog/t/binlog_old_versions.test: MYSQL_BINLOG was missing --local-load option. MYSQL was missing --local-infile=1 option.
| * | | | | Re-creating binlog_start_comment.test to make sure that changesunknown2008-02-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are propagated from earlier versions. BitKeeper/deleted/.del-binlog_start_comment.result: Delete: mysql-test/suite/binlog/r/binlog_start_comment.result mysql-test/suite/binlog/r/binlog_start_comment.result: Rename: mysql-test/suite/r/binlog_start_comment.result -> mysql-test/suite/binlog/r/binlog_start_comment.result BitKeeper/deleted/.del-binlog_start_comment.test: Delete: mysql-test/suite/binlog/t/binlog_start_comment.test mysql-test/suite/binlog/t/binlog_start_comment.test: Rename: mysql-test/suite/t/binlog_start_comment.test -> mysql-test/suite/binlog/t/binlog_start_comment.test
| * | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-mergeunknown2008-02-012-3/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge BitKeeper/deleted/.del-binlog_start_comment.test: Auto merged mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Auto merged
| | * | | | Various fixes to make tests pass on Windows.unknown2008-02-013-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/mix_innodb_myisam_binlog.result: Result change mysql-test/t/binlog_start_comment.test: Adding --local-load to mysqlbinlog to prevent it from failing on Windows. Also adding --short-form. mysql-test/t/mix_innodb_myisam_binlog.test: Extending LIKE pattern to use either \n or \r\n in order to work on Windows.
View Lorry Controller Status