1. 20 Feb, 2008 1 commit
    • unknown's avatar
      Bug #31316 Report server id clashes in SHOW SLAVE STATUS · e19c8e2e
      unknown authored
          "Server_IO_State" field
      
      Critical error messages from get_master_version_and_clock() were written
      only to the slave errorlog while Show slave status did not display any
      incident happened.
      
      Although the artifact was reported for a particular --replicate-same-server-id
      related issue the fix refines all critical error reporting with 
      deploying rli->report().
      
      The test for the bug covers only --replicate-same-server-id error reporting.
      
      
      mysql-test/suite/rpl/r/rpl_server_id1.result:
        new results reflecting changes
      mysql-test/suite/rpl/t/rpl_server_id1.test:
        Preserving the idea of the test unnecessary queries and the sleep are
        eliminated.
        In the end the slave must stop with the error displayable via $$$.
      sql/slave.cc:
        improving get_master_version_and_clock() code to report a critical incident
        via rli->report() that takes care of bothe the error log and
        the slave's status info placeholders.
        
        A critical error that force the IO slave thread to terminate is handled
        immediately (goto err).
      e19c8e2e
  2. 15 Feb, 2008 6 commits
    • unknown's avatar
      Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · e05e6814
      unknown authored
      into  riska.(none):/home/sven/bktip/5.1-new-rpl
      
      
      e05e6814
    • unknown's avatar
      Problem: After I moved rpl/t/rpl_variables.test into t/variables.test, · 3f0a603c
      unknown authored
      t/variables.test fails on embedded server. Moved out that part again, to
      a new test called t/variables-notembedded.test.
      
      
      mysql-test/t/variables-notembedded.test:
        BitKeeper file /home/sven/bk/debug-max/5.1-new-rpl/mysql-test/t/variables-notembedded.test
      mysql-test/r/variables-notembedded.result:
        Add -master.opt file to have a list of variables for slave_skip_errors.
      mysql-test/r/variables.result:
        Variable variables not available in embedded mode to a new test,
        variables-notembedded.test
      mysql-test/t/variables-notembedded-master.opt:
        Add --loose before --slave-skip-errors, so that it works if mtr is run
        with --embedded
      mysql-test/t/variables.test:
        Variable variables not available in embedded mode to a new test,
        variables-notembedded.test. Result file updated accordingly.
      3f0a603c
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · f56754b3
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b34458-mysql-5.1-rpl
      
      
      f56754b3
    • unknown's avatar
      Bug #34458 Extreneous use of templates in server code · 450ed5ae
      unknown authored
      Patch to remove white-space left over after removing anonymous
      namespace.
      
      
      sql/handler.cc:
        Removing indentation and whitespace.
      450ed5ae
    • unknown's avatar
      Bug #34458 Extreneous use of templates in server code · 40176e19
      unknown authored
      Replacing a template function with a normal static function.
      The template parameter, which previously was the class to
      find a binlogging function in, is now passed as a pointer to
      the actual binlogging function instead.
      
      The patch requires change of indention, but that is submitted
      as a separate patch.
      
      
      sql/handler.cc:
        Replacing template function with a normal static function.
      40176e19
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · dcb1b60b
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27877
      
      
      dcb1b60b
  3. 13 Feb, 2008 1 commit
    • unknown's avatar
      BUG#32991: Races in mysqldump.test (or mysqldump.test fails sporadically) · 68114c88
      unknown authored
      This is *not* a fix to the bug. I'm only disabling the failing part of
      mysqldump.test until the bug is fixed. Whoever fixes it, please re-enable
      the test.
      
      
      mysql-test/r/mysqldump.result:
        Disabling part of the test case until BUG#32991 is fixed. Result file
        updated accordingly.
      mysql-test/t/mysqldump.test:
        Disabling this part of the test case until BUG#32991 is fixed.
      68114c88
  4. 12 Feb, 2008 1 commit
    • unknown's avatar
      Moved mysql-test/suite/rpl/rpl_variables.test into · 914ae26c
      unknown authored
      mysql-test/t/variables.test, because:
       - mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything,
      so should not be in the rpl suite.
       - mysql-test/t/variables.test is the place for testing variable-related
      problems and features.
       - I will soon commit a patch containing a test case that tests
      replication of variables. It would be good if I could call the test case
      mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now.
      
      
      mysql-test/t/variables-master.opt:
        Rename: mysql-test/suite/rpl/t/rpl_variables-master.opt -> mysql-test/t/variables-master.opt
      BitKeeper/deleted/.del-rpl_variables.test:
        Delete: mysql-test/suite/rpl/t/rpl_variables.test
      BitKeeper/deleted/.del-rpl_variables.result:
        Delete: mysql-test/suite/rpl/r/rpl_variables.result
      mysql-test/r/variables.result:
        Moved mysql-test/suite/rpl/t/rpl_variables.test into
        mysql-test/t/variables.test . Result file needs to be updated.
      mysql-test/t/variables.test:
        Moved mysql-test/suite/rpl/t/rpl_variables.test into
        mysql-test/t/variables.test .
      914ae26c
  5. 11 Feb, 2008 2 commits
    • unknown's avatar
      Problem: pushbuild has sporadic errors during startup of · 2942c1ea
      unknown authored
      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.)
      2942c1ea
    • unknown's avatar
      Bug#27877 incorrect german order in utf8_general_ci · 530591ff
      unknown authored
      Problem: incorrect sort order for "U+00DF SHARP S".
      Fix: changing sort order for U+00DF to be equal to 's',
      like the manual says.
      
      
      
      mysql-test/r/ctype_latin1_de.result:
        Adding test
      mysql-test/r/ctype_uca.result:
        Adding test
      mysql-test/r/ctype_ucs.result:
        Adding test
      mysql-test/r/ctype_utf8.result:
        Adding test
      mysql-test/t/ctype_latin1_de.test:
        Adding test
      mysql-test/t/ctype_uca.test:
        Adding test
      mysql-test/t/ctype_ucs.test:
        Adding test
      mysql-test/t/ctype_utf8.test:
        Adding test
      strings/ctype-utf8.c:
        Changing weight for "U+00DF SHARP S"
      mysql-test/include/ctype_german.inc:
        New BitKeeper file ``mysql-test/include/ctype_german.inc''
      530591ff
  6. 09 Feb, 2008 1 commit
  7. 08 Feb, 2008 1 commit
    • unknown's avatar
      BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination · 5db7ee3e
      unknown authored
      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.
      5db7ee3e
  8. 07 Feb, 2008 6 commits
    • unknown's avatar
      WL#4078: Document binary format of binlog entries · 187e5c5f
      unknown authored
      Documented Table_map_log_event and packed integer format. Improved
      other documentation. No change outside comments.
      
      
      sql/log_event.h:
        Documented Table_map_log_event and packed integer format. Improved
        other documentation. No change outside comments.
      187e5c5f
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 1c48bea2
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        Auto merged
      1c48bea2
    • unknown's avatar
      Renaming some saved binary log files to avoid 99 characters · 2a482933
      unknown authored
      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
      2a482933
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 3b44afb0
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      sql/slave.cc:
        Auto merged
      3b44afb0
    • unknown's avatar
      Disabling declaration of debug variable for non-debug builds. · 7144184c
      unknown authored
      
      sql/slave.cc:
        Disabling declaration in non-debug builds.
      7144184c
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 5cb34d74
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      sql/slave.cc:
        Auto merged
      sql/sql_binlog.cc:
        Auto merged
      5cb34d74
  9. 06 Feb, 2008 4 commits
    • unknown's avatar
      Merge riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.0-rpl · ea7ecda2
      unknown authored
      into  riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.1-new-rpl
      
      
      client/mysqlbinlog.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      ea7ecda2
    • unknown's avatar
      Replace windows path separator backslash by unix path separator forward · 7b82376f
      unknown authored
      slash in filenames also for Create_file_log_event.
      
      
      client/mysqlbinlog.cc:
        BUG#34355: mysqlbinlog outputs backslash as path separator for 4.1 binlogs
        Problem: When the windows version of mysqlbinlog reads 4.1 binlogs
        containing LOAD DATA INFILE, it outputs backslashes as path separators in
        filenames. However, the output is typically piped to a client, and client
        expects forward slashes.
        Fix: Replace '\\' by '/' in filenames.
      7b82376f
    • unknown's avatar
      Patch to eliminate some valgrind warnings in debug printout code. · be5a46a6
      unknown authored
      
      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.
      be5a46a6
    • unknown's avatar
      Removing duplicate code from mysql-test-run.pl · 6cb9dfed
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Removing duplicate code.
      6cb9dfed
  10. 05 Feb, 2008 6 commits
    • unknown's avatar
      Updating result file for rpl_loaddata_map. · 781de196
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_loaddata_map.result:
        Result change.
      781de196
    • unknown's avatar
      Fixes to make tests pass on vanilla build. · f0f95695
      unknown authored
      
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        Adding --local-load to 'mysqlbinlog' and --local-infile=1 to 'mysql'.
      f0f95695
    • unknown's avatar
      Bug #34305 show slave status handling segfaults when slave io is about · 3b6a71a4
      unknown authored
          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.
      3b6a71a4
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · a63ef17f
      unknown authored
      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.
      a63ef17f
    • unknown's avatar
      Adding some more filtering for tests that kills queries and · df2cf8c7
      unknown authored
      cause sporadic, but benign, errors.
      
      
      mysql-test/lib/mtr_report.pl:
        Filtering out sporadic but benign error in rpl_err_ignoredtable.
      df2cf8c7
    • unknown's avatar
      Disabling test case binlog_old_version for embedded server. · 57c599b3
      unknown authored
      
      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.
      57c599b3
  11. 04 Feb, 2008 10 commits
  12. 03 Feb, 2008 1 commit