1. 16 Apr, 2013 3 commits
    • Lixun Peng's avatar
      Makeing rpl_filter for each Master_info. · 82eedf4e
      Lixun Peng authored
      Users can set different repplication filter rules for each replication connection, in my.cnf or command line.
      But the rules set online will not record in master.info, it means if users restart MySQL, these rules will lose.
      So if users wantn't their replication filter rules lose, they should write the rules in my.cnf.
      
      Users can set rules by 2 ways:
      1. Online SET command, "SET connection_name.replication_filter_settings = rules;".
      2. In my.cnf, "connection_name.replication_filter_settings = rules".
      
      If no connection_name in my.cnf, this rule will apply for ALL replication connection.
      If no connetion_name in SET statement, this rull will apply for default_connection_name.
      82eedf4e
    • Igor Babaev's avatar
      Merge mwl253 -> 10.0-base · aa052eeb
      Igor Babaev authored
      aa052eeb
    • Igor Babaev's avatar
      Added comments. · b12b3cae
      Igor Babaev authored
      Renamed the virtual method middle_point_pos for the class Field to
      pos_in_interval.
      b12b3cae
  2. 15 Apr, 2013 5 commits
  3. 14 Apr, 2013 4 commits
    • Elena Stepanova's avatar
    • Michael Widenius's avatar
      Fixed MDEV-4394 Sporadic failures in multi_source tests · 757a6b43
      Michael Widenius authored
      Fixed MDEV-4033 Unable to use slave's temporary directory /tmp - Can't create/write to file '/tmp/SQL_LOAD-' (Errcode: 17 "File exists")
      - Cache value of check_temp_dir() to avoid race condition
      - Set $rpl_server_count to avoid error in show_rpl_debug_info.inc
      
      mysql-test/suite/multi_source/info_logs.test:
        Set $rpl_server_count
      mysql-test/suite/multi_source/multisource.test:
        Set $rpl_server_count
      mysql-test/suite/multi_source/relaylog_events.test:
        Set $rpl_server_count
      mysql-test/suite/multi_source/reset_slave.test:
        Set $rpl_server_count
      mysql-test/suite/multi_source/simple.test:
        Set $rpl_server_count
      mysql-test/suite/multi_source/skip_counter.test:
        Set $rpl_server_count
      mysql-test/suite/multi_source/status_vars.test:
        Set $rpl_server_count
      sql/slave.cc:
        Cache value of check_temp_dir() to avoid race condition
      757a6b43
    • Sergei Golubchik's avatar
      5.5 merge · f57ecb77
      Sergei Golubchik authored
      f57ecb77
    • Sergei Golubchik's avatar
      add missing tests · d364e64a
      Sergei Golubchik authored
      d364e64a
  4. 13 Apr, 2013 5 commits
    • Igor Babaev's avatar
      Fixed compiler complains. · b53bf231
      Igor Babaev authored
      b53bf231
    • Sergey Petrunya's avatar
      Temporarily disable show_explain.test · 1fcb3336
      Sergey Petrunya authored
      1fcb3336
    • Sergey Petrunya's avatar
      Merge · 9bfbe7fb
      Sergey Petrunya authored
      9bfbe7fb
    • Sergey Petrunya's avatar
      Temporarily disable show_explain.test · 1095ef76
      Sergey Petrunya authored
      1095ef76
    • Alexey Botchkov's avatar
      MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). · d8dccde6
      Alexey Botchkov authored
               Syntax modified to allow statements:
                     ALTER TABLE ADD/DROP COLUMN
                     ALTER TABLE ADD/DROP INDEX
                     ALTER TABLE ADD/DROP FOREIGN KEY
                     ALTER TABLE ADD/DROP PARTITION
                     ALTER TABLE CHANGE COLUMN
                     ALTER TABLE MODIFY COLUMN
                     DROP INDEX
               to have IF (NOT) EXISTS options.
               Appropriate implementations added to mysql_alter_table().
            
            per-file comments:
              mysql-test/r/alter_table.result
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    test result updated.
              mysql-test/r/fulltext.result
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
              mysql-test/r/partition.result
                    test result updated.
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
              mysql-test/t/alter_table.test
                    tests added.
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
              mysql-test/t/fulltext.test
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    tests added.
              mysql-test/t/partition.test
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    tests added.
              sql/field.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    create_if_not_exists field added.
              sql/field.h
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    create_if_not_exists field added.
              sql/partition_info.h
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    has_unique_name made public.
              sql/sp_head.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
              sql/sql_class.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    create_if_not_exists inited.
              sql/sql_class.h
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    create_if_not_exists inited.
              sql/sql_lex.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    check_exists inited.
              sql/sql_lex.h
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    check_exists inited.
              sql/sql_parse.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
              check_exists inited.
              sql/sql_table.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    handle_if_exists_options() added.
                    it's called in mysql_alter_table().
              sql/sql_trigger.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    check_exists instead of drop_if_exists.
              sql/sql_view.cc
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    check_exists instead of drop_if_exists.
              sql/sql_yacc.yy
            MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).
                    sintax modified.
      d8dccde6
  5. 12 Apr, 2013 4 commits
    • Igor Babaev's avatar
      Merge 10.0-base->mwl253 · 0594dc66
      Igor Babaev authored
      0594dc66
    • Alexey Botchkov's avatar
      MDEV-3917 multiple use locks (GET_LOCK) in one connection. · 1a600125
      Alexey Botchkov authored
          The patch contributed by Konstantin Osipov applied.
          Native comments:
            Implement multiple user-level locks per connection.
      
            GET_LOCK() function in MySQL allows a connection  to hold at most
            one user level lock. Taking a new lock automatically releases the
            old lock, if any.
      
            The limit of one lock per session existed since  early versions
            of MySQL didn't have a deadlock detector for SQL locks.
            MDL patches in MySQL 5.5 added a deadlock detector,
            so starting from 5.5 it became possible to take multiple locks
            in any order -- a deadlock, should it occur, would be detected
            and an error returned to the client which closed the wait chain.
      
            This is exactly what is done in this patch: ULLs are moved
            to use MDL subsystem.
      1a600125
    • Michael Widenius's avatar
      Increase default value of max_binlog_cache_size and max_binlog_stmt_cache_size to ulonglong_max. · aa4c7dea
      Michael Widenius authored
      This fixes that by default LOAD DATA INFILE will not generate the error:
      "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage..."
      
      
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result:
        Updated test case
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result:
        Updated test case
      sql/sys_vars.cc:
        Increase default value of max_binlog_cache_size and max_binlog_stmt_cache_size to ulonglong_max.
      aa4c7dea
    • Igor Babaev's avatar
      Fixed bug mdev-4389. · f3bbd403
      Igor Babaev authored
      The selectivity of a range degenerated into a point never should be set to 0.
      f3bbd403
  6. 11 Apr, 2013 4 commits
  7. 10 Apr, 2013 2 commits
    • Sergei Golubchik's avatar
      portability fixes for mysql-test · ff3407a1
      Sergei Golubchik authored
      mysql-test/r/mysqld--help.result:
        that's default to number of CPUs
      mysql-test/suite/archive/discover.test:
        move_file uses rename(2), which may end up
        with "Invalid cross-device link"
      mysql-test/suite/archive/partition_archive.test:
        on Solaris the error message is different
      ff3407a1
    • Sergei Golubchik's avatar
      Linking problem on Windows · 3ed6b24d
      Sergei Golubchik authored
      3ed6b24d
  8. 09 Apr, 2013 13 commits