1. 18 Dec, 2012 5 commits
  2. 17 Dec, 2012 6 commits
  3. 16 Dec, 2012 2 commits
    • Sergei Golubchik's avatar
      small code cleanup taken from MySQL 5.6 · 4923d19b
      Sergei Golubchik authored
      4923d19b
    • Sergei Golubchik's avatar
      MDEV-3816 init-file stops getting executed if a long enough line is... · fe7c2aae
      Sergei Golubchik authored
      MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails
      backport improved bootstrap error handling from 5.6
      
      Was:
        revno: 3768.1.1
        committer: Christopher Powers <chris.powers@oracle.com>
        timestamp: Wed 2012-05-02 22:16:40 -0500
        message:
          Bug#11766342 INITIAL DB CREATION FAILS ON WINDOWS WITH AN ASSERT IN SQL_ERROR.CC
          Improved bootstrap error handling:
          - Detect and report file i/o errors
          - Report query size errors with nearest query text
      fe7c2aae
  4. 15 Dec, 2012 3 commits
    • Sergei Golubchik's avatar
      MDEV-3834 Crossgrade from MySQL 5.6.7 to MariaDB 10.0 fails due to non-existing mysql.host table · 1679fe1c
      Sergei Golubchik authored
      Treat the host table as optional, don't abort when it's missing
      1679fe1c
    • Sergei Golubchik's avatar
      MDEV-3837 Assertion `table->read_set == &table->def_read_set' failed on... · 47f5632d
      Sergei Golubchik authored
      MDEV-3837 Assertion `table->read_set == &table->def_read_set' failed on updating a performance_schema table
      This was failing not only for P_S, but for any engine that had
      HA_PRIMARY_KEY_REQUIRED_FOR_DELETE flag set (in the tree - only P_S and federated).
      Because of this flag, read_set and write_set were (possibly) changed
      on update. But later the code modified these bitmaps and restored them to the default
      state, losing HA_PRIMARY_KEY_REQUIRED_FOR_DELETE related changes.
      
      sql/handler.cc:
        small optimization.
        don't change the *write* set only because all columns has to be *read*
      47f5632d
    • Sergei Golubchik's avatar
      MDEV-3860 backport --plugin-load-add (and related mysql-test changes) · 2217717f
      Sergei Golubchik authored
        revno: 3383
        revision-id: georgi.kodinov@oracle.com-20110818083108-qa3h3ufqu4zne80a
        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
        timestamp: Thu 2011-08-18 11:31:08 +0300
        message:
      
        Bug #11766001: 59026: ALLOW MULTIPLE --PLUGIN-LOAD OPTIONS
        
        Implemented support for a new command line option :
        --plugin-load-add=<comma-separated-name-equals-value-list>
        This option takes the same type of arguments that --plugin-load does
        and complements --plugin-load (that continues to operate as before) by
        appending its argument to the list specified by --plugin-load.
        So --plugin-load can be considered a composite option consisting of 
        resetting the plugin load list and then calling --plugin-load-add to process
        the argument.
        Note that the order in which you specify --plugin-load and --plugin-load-add 
        is important : "--plugin-load=x --plugin-load-add=y" will be equivalent to
        "--plugin-load=x,y" whereas "--plugin-load-add=y --plugin-load=x" will be 
        equivalent to "plugin-load=x".
        
        Incompatible change : the --help --verbose command will no longer print the 
        --plugin-load variable's values (as it doesn't have one). Otherwise both --plugin-load 
        and --plugin-load-add are mentioned in it.
      2217717f
  5. 14 Dec, 2012 2 commits
  6. 13 Dec, 2012 1 commit
  7. 12 Dec, 2012 1 commit
  8. 26 Nov, 2012 1 commit
    • unknown's avatar
      Fix of MDEV-3874: Server crashes in Item_field::print on a SELECT from a MERGE... · b8b875cb
      unknown authored
      Fix of MDEV-3874: Server crashes in Item_field::print on a SELECT from a MERGE view with materialization+semijoin, subquery, ORDER BY.
      
      The problem was that in debugging binaries it try to print item to assign human readable name to the item.
      But subquery item was already freed (join_free/cleanup with full cleanup) so Item_field refers to temporary
      table which memory had been already freed.
      b8b875cb
  9. 05 Dec, 2012 1 commit
    • Igor Babaev's avatar
      Fixed bug mdev-3888. · 5e345281
      Igor Babaev authored
      When inserting a record with update on duplicate keys the server calls
      the ha_index_read_idx_map handler function to look for the record
      that violates unique key constraints. The third parameter of this call
      should mark only the base components of the index where the server is
      searched for the record. Possible hidden components of the primary key
      are to be unmarked.
      5e345281
  10. 01 Dec, 2012 2 commits
  11. 27 Nov, 2012 3 commits
  12. 26 Nov, 2012 2 commits
  13. 22 Nov, 2012 2 commits
  14. 21 Nov, 2012 2 commits
  15. 20 Nov, 2012 3 commits
    • unknown's avatar
      MDEV-3861: Assertion in TC_LOG_MMAP. · 6058b654
      unknown authored
      Root cause was that number of entries in commit checkpoint buffer
      was bigger than total available entries in the mmap()'ed score
      file. This causes TC_LOG_MMAP to run out of entries before even
      the first checkpoint is started, which causes a hang.
      
      Fixed by making sure we have fewer entries within one commit
      checkpoint than total available scorefile entries.
      
      Another part of this bug was discovery of severel unrelated bugs
      in TC_LOG_MMAP dating back to 5.1. These were fixed in 5.1 and
      will be merged up (the problem this patch fixes exists only in
      10.0).
      6058b654
    • unknown's avatar
    • unknown's avatar
      Merge MariaDB 10.0-base -> 10.0 · 49b1d95e
      unknown authored
      49b1d95e
  16. 17 Nov, 2012 1 commit
    • Sergei Golubchik's avatar
      MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when... · 13ba0dd2
      Sergei Golubchik authored
      MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when converting to DECIMAL" on a query with aggregate functions and GROUP BY
      
      fix: don't call field->val_decimal() if the field->is_null()
      because the buffer at field->ptr might not hold a valid decimal value
      
      sql/item_sum.cc:
        do not call field->val_decimal() if the field->is_null()
      storage/maria/ma_blockrec.c:
        cleanup
      storage/maria/ma_rrnd.c:
        cleanup
      strings/decimal.c:
        typo
      13ba0dd2
  17. 20 Nov, 2012 3 commits