1. 11 Jan, 2013 2 commits
  2. 09 Jan, 2013 1 commit
  3. 08 Jan, 2013 2 commits
    • Igor Babaev's avatar
      Merge 5.5 -> mwl248 · 7d9df807
      Igor Babaev authored
      7d9df807
    • Igor Babaev's avatar
      Fixed bug mdev-3979. · 01dca17a
      Igor Babaev authored
      Made allocation of memory for statistical data in a table share to be thread safe.
      This memory is now allocated in a special MEM_ROOT that is created for each
      table share.  
      01dca17a
  4. 05 Jan, 2013 1 commit
  5. 01 Jan, 2013 1 commit
  6. 30 Dec, 2012 1 commit
  7. 28 Dec, 2012 1 commit
    • Elena Stepanova's avatar
      storage_engine tests and upstream engines/* suites went out of sync with... · 2371b6df
      Elena Stepanova authored
      storage_engine tests and upstream engines/* suites went out of sync with current MariaDB code. Reasons:
        - as of 5.5.27, YEAR(2) is deprecated, hence the new warning;
        - MDEV-553 - different error code/message on out-of-range autoincrement;
        - INSERT IGNORE now produces a warning if a duplicate was encountered (change pushed along with MDEV-553)
      
      2371b6df
  8. 20 Dec, 2012 3 commits
  9. 18 Dec, 2012 5 commits
  10. 17 Dec, 2012 7 commits
  11. 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
  12. 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
  13. 14 Dec, 2012 4 commits
  14. 13 Dec, 2012 2 commits
    • unknown's avatar
      MDEV-452 Add full support for auto-initialized/updated timestamp and datetime · 6e8c4d69
      unknown authored
      Post-review changes according to Monty's review from 28/11/2012.
      6e8c4d69
    • Igor Babaev's avatar
      Fixed bug mdev-3891. · 65820439
      Igor Babaev authored
      If a query referenced some system statistical tables, but not all of them,
      then executing an ANALYZE command simultaneously with this query could
      lead to a deadlock.
      The fix prohibited reading statistics from system statistical tables
      for such queries.
      
      Removed the function unlock_tables_n_open_system_tables_for_write()
      as not used anymore.
      Performed some minor refactoring of the code in sql_statistics.cc. 
      65820439
  15. 12 Dec, 2012 1 commit
  16. 10 Dec, 2012 1 commit
  17. 08 Dec, 2012 1 commit
    • Igor Babaev's avatar
      Addressed the following issue from the review of the patch for · 2447bc4c
      Igor Babaev authored
      engine-independent statistics.
      When the primary key was dropped or changed statistics on secondary
      indexes for the prefixes that included components of the primary 
      key was not removed from the table mysql.index_stats.
      
      Also fixed: in the some cases when a column was changed statistics
      on the indexes that included this column was not removed from the
      table mysql.index_stats.
      
      Also disabled the test mdev-504 for --ps-protocol.
      2447bc4c
  18. 06 Dec, 2012 2 commits