1. 19 Dec, 2014 3 commits
  2. 18 Dec, 2014 2 commits
    • Sergey Petrunya's avatar
      Merge 5.3 -> 5.5 · 13e1acc5
      Sergey Petrunya authored
      13e1acc5
    • Sergey Petrunya's avatar
      MDEV-6830: Server crashes in best_access_path after a sequence of SELECTs ... · b75090c7
      Sergey Petrunya authored
      generate_derived_keys_for_table() did not work correctly in the case where
      - it had a potential index on derived table
      - however, TABLE::check_tmp_key() would disallow creation of this index 
        after looking at its future key parts (because of the key parts exceeding 
        max. index length)
      - the code would leave a KEYUSE structure that refers to a non-existant index.
        Depending on further optimizer calculations, this could cause a crash. 
      b75090c7
  3. 17 Dec, 2014 3 commits
  4. 16 Dec, 2014 1 commit
  5. 15 Dec, 2014 4 commits
    • Michael Widenius's avatar
      MDEV-6855 Assertion `cond_type == Item::FUNC_ITEM' failed in... · 5257d71e
      Michael Widenius authored
      MDEV-6855 Assertion `cond_type == Item::FUNC_ITEM' failed in check_group_min_max_predicates with GROUP BY, aggregate in WHERE SQ, multi-part key
      
      
      mysql-test/r/group_by.result:
        Test for MDEV-6855
      mysql-test/t/group_by.test:
        Test for MDEV-6855
      sql/item.h:
        Fixed spelling error
      sql/opt_range.cc:
        Added handling of cond_type == Item::CACHE_ITEM in WHERE clauses for MIN/MAX optimization.
        Fixed indentation
      5257d71e
    • Michael Widenius's avatar
      MDEV-4010 Deadlock on concurrent INSERT .. SELECT into an Aria table with statement binary logging · 10ab3e68
      Michael Widenius authored
      There was a bug in lock handling when mixing INSERT ... SELECT on the same table.
      
      
      mysql-test/suite/maria/insert_select.result:
        Test case for MDEV_4010
      mysql-test/suite/maria/insert_select.test:
        Test case for MDEV_4010
      mysys/thr_lock.c:
        We wrongly alldoed TL_WRITE_CONCURRENT_INSERT when there was a TL_READ_NO_INSERT lock
      10ab3e68
    • Michael Widenius's avatar
      MDEV-6896 kill user command cause MariaDB crash · 80ee57a3
      Michael Widenius authored
      mysql-test/r/kill-2.result:
        test case for MDEV-6896
      mysql-test/t/kill-2-master.opt:
        test case for MDEV-6896
      mysql-test/t/kill-2.test:
        test case for MDEV-6896
      sql/sql_parse.cc:
        Use host_or_ip instead of host as host may be 0
      80ee57a3
    • Michael Widenius's avatar
      MDEV-6871 Multi-value insert on MyISAM table that makes slaves crash (when... · 4a32d9c0
      Michael Widenius authored
      MDEV-6871 Multi-value insert on MyISAM table that makes slaves crash (when using --skip-external-locking=0)
      Problem was that repair() did lock and unlock tables, which leaved already locked tables in wrong state
      
      include/my_check_opt.h:
        Added option T_NO_LOCKS to disable locking during repair()
        Fixed duplicated bit T_NO_CREATE_RENAME_LSN
      mysql-test/suite/rpl/r/myisam_external_lock.result:
        Test case for MDEV-6871
      mysql-test/suite/rpl/t/myisam_external_lock-slave.opt:
        Test case for MDEV-6871
      mysql-test/suite/rpl/t/myisam_external_lock.test:
        Test case for MDEV-6871
      storage/maria/ha_maria.cc:
        Don't lock tables during enable_indexes()
        Removed some calls to current_thd
      storage/myisam/ha_myisam.cc:
        Don't lock tables during enable_indexes()
        Removed some calls to current_thd
      4a32d9c0
  6. 12 Dec, 2014 2 commits
  7. 01 Dec, 2014 1 commit
  8. 03 Dec, 2014 1 commit
  9. 02 Dec, 2014 1 commit
  10. 01 Dec, 2014 1 commit
  11. 25 Nov, 2014 3 commits
  12. 21 Nov, 2014 3 commits
  13. 20 Nov, 2014 1 commit
  14. 19 Nov, 2014 4 commits
    • Sergei Golubchik's avatar
      Fix YaSSL on windows · ed2cc2a8
      Sergei Golubchik authored
      This came with the upgrade from yassl 2.3.0 to 2.3.4 -
      ssl tests started to hang on Windows. Comparing and removing changes
      I've got to this:
      
       void input_buffer::set_current(uint i) 
       {
      -    if (i)
      -        check(i - 1, size_); 
      -    current_ = i; 
      +    if (error_ == 0 && i && check(i - 1, size_) == 0)
      +        current_ = i;
      +    else
      +        error_ = -1;
       }
      
      in 2.3.0 i==0 was only used to avoid the check, in 2.3.4 it's an error.
      but there are places in the code that do set_current(0) and others that
      do, like, { before=get_current(); ...; set_current(before); } - and the
      initial value of current_ is 0.
      
      So, I suspect that set_current(0) should not be an error, but it should
      only skip the check().
      ed2cc2a8
    • Sergei Golubchik's avatar
      MDEV-6975 Implement TLS protocol · d851d5e7
      Sergei Golubchik authored
      followup:
      * explicitly disable SSLv2 and SSLv3, keep other protocols enabled
      * fix a compiler warning
      * rename the test and combinations to avoid confusion
      
      vio/viossl.c:
        fix a compiler warning
      d851d5e7
    • Jan Lindström's avatar
      MDEV-7084: innodb index stats inadequate using constant · 8bc5eabe
      Jan Lindström authored
      innodb_stats_sample_pages
      
      Analysis: If you set the number of analyzed pages 
      to very low number compared to actual pages on 
      that table/index it randomly pics those pages 
      (default 8 pages), this leads to fact that query 
      after analyze table returns different results. If 
      the index tree is small, smaller than 10 * 
      n_sample_pages + total_external_size, then the 
      estimate is ok. For bigger index trees it is 
      common that we do not see any borders between 
      key values in the few pages we pick. But still 
      there may be n_sample_pages different key values, 
      or even more. And it just tries to 
      approximate to n_sample_pages (8).
      
      Fix: (1) Introduced new dynamic configuration variable
      innodb_stats_sample_traditional  that retains
      the current design. Default false.
      
      (2) If traditional sample is not used we use
      n_sample_pages = max(min(srv_stats_sample_pages,
                               index->stat_index_size),
                           log2(index->stat_index_size)*
                                srv_stats_sample_pages);
      
      (3) Introduced new dynamic configuration variable
      stat_modified_counter (default = 0) if set
      sets lower bound for row updates when statistics is re-estimated.
      
      If user has provided upper bound for how many rows needs to be updated
      before we calculate new statistics we use minimum of provided value
      and 1/16 of table every 16th round. If no upper bound is provided
      (srv_stats_modified_counter = 0, default) then calculate new statistics
      if 1 / 16 of table has been modified
      since the last time a statistics batch was run.
      We calculate statistics at most every 16th round, since we may have
      a counter table which is very small and updated very often.
      @param t table
      @return true if the table has changed too much and stats need to be
      recalculated
      */
      #define DICT_TABLE_CHANGED_TOO_MUCH(t) \
      	((ib_int64_t) (t)->stat_modified_counter > (srv_stats_modified_counter ? \
      	ut_min(srv_stats_modified_counter, (16 + (t)->stat_n_rows / 16)) : \
      		16 + (t)->stat_n_rows / 16))
      8bc5eabe
    • Kristian Nielsen's avatar
      MDEV-7026: Race in InnoDB/XtraDB mutex implementation can stall or hang the server. · 6ea41f1e
      Kristian Nielsen authored
      The bug was that full memory barrier was missing in the code that ensures that
      a waiter on an InnoDB mutex will not go to sleep unless it is guaranteed to be
      woken up again by another thread currently holding the mutex. This made
      possible a race where a thread could get stuck waiting for a mutex that is in
      fact no longer locked. If that thread was also holding other critical locks,
      this could stall the entire server. There is an error monitor thread than can
      break the stall, it runs about once per second. But if the error monitor
      thread itself got stuck or was not running, then the entire server could hang
      infinitely.
      
      This was introduced on i386/amd64 platforms in 5.5.40 and 10.0.13 by an
      incorrect patch that tried to fix the similar problem for PowerPC.
      
      This commit reverts the incorrect PowerPC patch, and instead implements a fix
      for PowerPC that does not change i386/amd64 behaviour, making PowerPC work
      similarly to i386/amd64.
      6ea41f1e
  15. 18 Nov, 2014 10 commits