*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
storage/maria/ma_control_file.c:
Even if the file is just created we have to lock it, otherwise some
other Maria instance may write to it.
storage/maria/ma_pagecache.c:
catch too big page numbers when they enter the pagecache; this helps
debugging BUG#34250.
sql/rpl_rli.cc:
Adding variable to mark an instance of Relay_log_info as fake.
sql/rpl_rli.h:
Adding variable to mark an instance of Relay_log_info as fake.
sql/slave.cc:
Not printing debug information if we are working with a fake
instance of Relay_log_info. This because the result of calling
update is nonsense, and trying to print it generates valgrind
warnings.
sql/sql_binlog.cc:
Marking newly created instance of Relay_log_info as a fake instance.
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
to leave
The artifact was caused by
a flaw in concurrent accessing the slave's io thd by
the io itself and a handling show slave status thread.
Namely, show_master_info did not acquire mi->run_lock mutex that is
specified for mi->io_thd member.
Fixed with deploying the mutex locking and unlocking. The mutex is kept
short time and without interleaving with mi->data_lock mutex.
Todo: to report and fix an issue with
sys_var_slave_skip_counter::{methods}
seem to acquire incorrectly
active_mi->rli.run_lock
instead of the specified
active_mi->rli.data_lock
A test case is difficult to compose, so rpl_packet should continue serving
as the indicator.
sql/slave.cc:
implementing a TODO left at 4.1 time:
mending access to mi->io_thd with the specified mutex;
sql/slave.h:
adding a member name to the list of that run_lock guards.
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.
mysql-test/include/wait_until_connected_again.inc:
On Windows, mysqladmin does not wait on pid file when it has shut down
mysqld. Thus, in maria_empty_logs.inc, wait_until_connected_again.inc
can run while mysqld is shutting down (has not finished) and so
get "shutdown in progress" instead of "can't connect".
mysql-test/t/maria-recovery-big.test:
it is a big test
storage/maria/unittest/ma_test_recovery.pl:
We want to see the result of 'cmp', like in the shell version
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.
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.
dbug/dbug.c:
function/ (a.k.a. SUBDIR) syntax
dbug/tests-t.pl:
1. add support for test comments
2. add test comments
3. move tests around
4. add SUBDIR tests
dbug/tests.c:
support code for SUBDIR testing
include/my_dbug.h:
comments. change in _db_set_ prototype
dbug/user.r:
negative lists and function/ syntax.
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.
- one which led REDO_INSERT_ROW_BLOBS to fail to apply
- one excess close ("-1 file left open")
Don't need maria-path option / environment variable.
Fixes for ma_test_all-t to run under Windows.
Port of ma_test_recovery to Perl, written by Jani.
storage/maria/unittest/ma_test_recovery.expected:
Rename: storage/maria/ma_test_recovery.expected -> storage/maria/unittest/ma_test_recovery.expected
mysys/my_pread.c:
Fix for Windows-specific bug (maria_read_log -a failed during
ma_test_all-t): Windows does not have pread() so the branch setting
HA_ERR_FILE_TOO_SHORT was not compiled in, broke applying of
REDO_INSERT_ROW_BLOBS. After fixing that, it appeared that in my
Windows machine, errno is not changed in case of EOF; as we read it
we have to reset it at start.
The changed to readbytes!=-1 is to detect EOF
mysys/my_read.c:
The change to readbytes!=-1 is to detect EOF
storage/maria/ma_loghandler.c:
Fix for Windows-specific bug: as we don't open the directory
we should not close it.
storage/maria/ma_page.c:
This is C, cannot declare variable after instruction.
storage/maria/ma_test_recovery:
ma_test_recovery.expected moved
storage/maria/unittest/ma_test_all-t:
Can now safely guess maria_path so don't need the command-line option
or environment variable. Port to Windows (.exe, different locations
of executables); can guess suffix, don't need --suffix.
storage/maria/unittest/ma_test_recovery.pl:
Perl version of ma_test_recovery, written by Jani. Will deprecate the
shell version.
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.
This patch adds code to convert the path for LOAD DATA INFILE
events to a Unix path which is needed for running mysql client
on Windows.
client/mysqlbinlog.cc:
BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
This patch adds code to convert the path for LOAD DATA INFILE
events to a Unix path which is needed for running mysql client
on Windows.
The 'd:\x\y\z' path becomes 'd:xyz' when run in the client.
storage/maria/ma_test_recovery.expected:
Removed a white space from a list of tests.
This was originally unintentional and change makes it easier to
port ma_test_recovery to Perl.
storage/maria/ma_test_recovery:
Removed a white space from a list of tests.
unit tests for dbug
dbug/Makefile.am:
unit tests for dbug
dbug/dbug.c:
negative lists (-#-d,info => everything but "info")
include/my_dbug.h:
negative lists (-#-d,info => everything but "info")
unittest/Makefile.am:
unit tests for dbug
dbug/tests-t.pl:
unit tests for dbug
dbug/tests.c:
unit tests for dbug
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.
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
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.
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
BitKeeper/deleted/.del-binlog_start_comment.test:
Auto merged
include/my_sys.h:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged