1. 28 Mar, 2014 7 commits
    • Michael Widenius's avatar
      automatic merge · d5a185a5
      Michael Widenius authored
      d5a185a5
    • Michael Widenius's avatar
      Updated sponsors and authors · 3f7ee1f1
      Michael Widenius authored
      3f7ee1f1
    • Michael Widenius's avatar
      Fixed that the we don't change CREATE to CREATE OR REPLACE, except if the... · 10ae6e35
      Michael Widenius authored
      Fixed that the we don't change CREATE to CREATE OR REPLACE, except if the slave removed an existing table as part of CREATE.
      This will help the following replicaition scenario:
      MariaDB 10.0 master (statement replication) -> MariaDB 10.0 slave (row based replication) -> MySQL or MariaDB 5.x slave
      
      
      mysql-test/r/mysqld--help.result:
        Updated help text
      mysql-test/suite/rpl/r/create_or_replace_mix.result:
        Added more tests
      mysql-test/suite/rpl/r/create_or_replace_row.result:
        Added more tests
      mysql-test/suite/rpl/r/create_or_replace_statement.result:
        Added more tests
      mysql-test/suite/rpl/t/create_or_replace.inc:
        Added more tests
      sql/handler.h:
        Added org_options so that we can detect what come from the query and what was possible added later.
      sql/sql_insert.cc:
        Only write CREATE OR REPLACE if was originally specified or if we delete a conflicting table as part of create
      sql/sql_parse.cc:
        Remember orginal create options
      sql/sql_table.cc:
        Only write CREATE OR REPLACE if was originally specified or if we delete a conflicting table as part of create
      sql/sys_vars.cc:
        Updated help text
      10ae6e35
    • Sergey Vojtovich's avatar
      MDEV-5964 - main.mdev-504 unveils assertion failure in · 71064cbe
      Sergey Vojtovich authored
                  TABLE_SHARE::visit_subgraph
      
      tc_acquire_table() is not ready to update TABLE::in_use without mutex:
      thr1: table= free_tables.pop_front(); // table->in_use is 0
      thr2: tdc_remove_table();
      thr2: find_deadlock(); // assert(table->in_use != 0)
      thr1: table->in_use= thd;
      
      Protect update of TABLE::in_use by LOCK_table_share.
      71064cbe
    • Sergey Petrunya's avatar
      68015a99
    • Sergey Petrunya's avatar
      Merge · 44c8e2bb
      Sergey Petrunya authored
      44c8e2bb
    • Sergey Petrunya's avatar
      MDEV-5978: valgrind failure in rpl_row_corruption · f68332cb
      Sergey Petrunya authored
      - Fix valgrind failure: don't touch table_list->master_had_triggers 
        when RBR_TRIGGERS is not compiled in.
      f68332cb
  2. 27 Mar, 2014 12 commits
  3. 26 Mar, 2014 21 commits