Commit graph

53309 commits

Author SHA1 Message Date
unknown
7b59b82f8f after-merge
*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
2008-02-06 17:55:04 +01:00
unknown
7223b4edf5 Lock control file also when we have created it in this run. Assertions.
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.
2008-02-06 17:28:54 +01:00
unknown
be5a46a69b Patch to eliminate some valgrind warnings in debug printout code.
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.
2008-02-06 14:44:47 +01:00
unknown
6cb9dfed6f Removing duplicate code from mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  Removing duplicate code.
2008-02-06 06:18:06 +01:00
unknown
781de19688 Updating result file for rpl_loaddata_map.
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
  Result change.
2008-02-05 19:44:16 +01:00
unknown
f0f956958a Fixes to make tests pass on vanilla build.
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Adding --local-load to 'mysqlbinlog' and --local-infile=1 to 'mysql'.
2008-02-05 17:05:59 +01:00
unknown
2e6a7416cd Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
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
2008-02-05 16:47:11 +01:00
unknown
3b6a71a4b0 Bug #34305 show slave status handling segfaults when slave io is about
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.
2008-02-05 17:36:26 +02:00
unknown
a63ef17fca Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
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.
2008-02-05 14:52:20 +01:00
unknown
7e54b96791 cleanup
dbug/dbug.c:
  dbug naming conventions
include/my_dbug.h:
  unused function
2008-02-05 14:19:53 +01:00
unknown
df2cf8c78d Adding some more filtering for tests that kills queries and
cause sporadic, but benign, errors.


mysql-test/lib/mtr_report.pl:
  Filtering out sporadic but benign error in rpl_err_ignoredtable.
2008-02-05 13:31:57 +01:00
unknown
cd6a090a78 Merge bk-internal.mysql.com:/home/bk/mysql-maria
into  janus.mylan:/usr/home/serg/Abk/mysql-maria
2008-02-05 10:41:50 +01:00
unknown
57c599b3d4 Disabling test case binlog_old_version for embedded server.
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.
2008-02-05 08:22:27 +01:00
unknown
99b3d018be Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria
into  mysqlwin32.:C:/mysql-maria


storage/maria/unittest/ma_test_recovery.pl:
  Auto merged
2008-02-04 22:15:29 +01:00
unknown
0543c5f028 Minor test fixes
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
2008-02-04 22:12:57 +01:00
unknown
d4e3ab9cf6 Merge riska.(none):/home/sven/bktip/5.1-new-rpl
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
2008-02-04 14:37:34 +01:00
unknown
99f67290ad Fixing result change after merge.
mysql-test/suite/rpl/r/rpl_user.result:
  Result change.
2008-02-04 14:29:23 +01:00
unknown
5716a69961 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.
2008-02-04 13:23:20 +01:00
unknown
74bd1b0faf Updating result file.
mysql-test/r/rpl_user.result:
  Result change.
2008-02-04 13:19:29 +01:00
unknown
1bc4867d3b Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/t/rpl_user.test:
  Manual merging.
2008-02-04 12:33:28 +01:00
unknown
86260ead5a Fixes to make rpl_user test pass in pushbuild.
mysql-test/t/rpl_user.test:
  Removing redundant reset master and deleting users from master
  and slave without using binary log.
2008-02-04 12:22:37 +01:00
unknown
4a52cbaa2e More fixes to remove test failures in pushbuild.
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.
2008-02-04 12:12:03 +01:00
unknown
b14b7fc3d7 Yet more changes to fix the merge clone.
mysql-test/suite/rpl/t/rpl_idempotency.test:
  Adding "have_innodb.inc" since the test reqires InnoDB.
2008-02-04 08:43:22 +01:00
unknown
2bccc0e600 Masking out some more errors and warnings that are benign.
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.
2008-02-04 07:15:14 +01:00
unknown
0780f0bf98 Minor fix to make rpl_loaddata_map pass without warnings.
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.
2008-02-04 06:49:15 +01:00
unknown
7a0a322320 ignore:
added dbug/tests


BitKeeper/etc/ignore:
  added dbug/tests
2008-02-03 23:14:23 +01:00
unknown
fe7287f8f7 dbug: function/ (a.k.a. SUBDIR) syntax
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.
2008-02-03 20:58:47 +01:00
unknown
eca6968963 Removing expected errors from slave from the warnings file.
mysql-test/lib/mtr_report.pl:
  Removing some expected warnings and errors from the slave for
  tests rpl_idempotency and rpl_skip_error.
2008-02-03 18:43:05 +01:00
unknown
5d66c3565a Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if
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.
2008-02-03 11:48:45 +01:00
unknown
29245b9337 Disabling various tests and reporting bugs for them.
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.
2008-02-02 08:15:36 +01:00
unknown
a1834802c9 compiler warning 2008-02-02 01:00:27 +01:00
unknown
6483b8457f fix for recovery unit test under Unix
storage/maria/unittest/ma_test_recovery.pl:
  Perl magic does something unexpected with $suffix is ""
2008-02-02 00:42:05 +01:00
unknown
4a1763e428 Fix for Windows-specific bugs:
- 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.
2008-02-02 00:01:31 +01:00
unknown
10aaf68bfe Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


client/mysqlbinlog.cc:
  Auto merged
2008-02-01 20:28:30 +01:00
unknown
f72adc70e9 Fixes to make tests pass in pushbuild.
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.
2008-02-01 20:26:39 +01:00
unknown
c078b5c572 Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl-merge
into  mysql_cab_desk.:D:/source/c++/mysql-5.0-rpl-merge
2008-02-01 14:01:21 -05:00
unknown
06477018e7 Merge bk-internal.mysql.com:/home/bk/mysql-maria
into  janus.mylan:/usr/home/serg/Abk/mysql-maria
2008-02-01 19:32:47 +01:00
unknown
b0747b45c4 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. 


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.
2008-02-01 13:11:03 -05:00
unknown
44e89ac0c8 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
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
2008-02-01 17:57:22 +01:00
unknown
16f92309e4 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria
2008-02-01 17:43:47 +01:00
unknown
d9b108051d Very minor changes in ma_test_recovery test suite.
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.
2008-02-01 17:42:51 +01:00
unknown
0a9fa8265b Again blanking out some numbers in file names that is dependent
on the context.


mysql-test/r/mysqlbinlog.result:
  Result file change.
mysql-test/t/mysqlbinlog.test:
  Blanking out yet some numbers in file names.
2008-02-01 17:26:28 +01:00
unknown
d79e70597a negative lists in dbug (-#-d,info => everything but "info").
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
2008-02-01 16:21:44 +01:00
unknown
7fabc5148a Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
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
2008-02-01 15:38:14 +01:00
unknown
818358ed33 Fixes to make tests pass in pushbuild.
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.
2008-02-01 15:34:34 +01:00
unknown
1e40902cc5 Fixes to makes tests pass on Windows and vanilla build.
mysql-test/suite/binlog/t/binlog_old_versions.test:
  MYSQL_BINLOG was missing --local-load option.
  MYSQL was missing --local-infile=1 option.
2008-02-01 14:27:23 +01:00
unknown
2d57d78079 Re-creating binlog_start_comment.test to make sure that changes
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
2008-02-01 13:49:28 +01:00
unknown
32555d8280 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
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
2008-02-01 13:28:11 +01:00
unknown
d315117745 Various fixes to make tests pass on Windows.
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.
2008-02-01 13:18:27 +01:00
unknown
bae60143bf Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
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
2008-02-01 12:15:23 +01:00