1. 16 Dec, 2012 1 commit
    • 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
  2. 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
  3. 12 Dec, 2012 1 commit
  4. 20 Nov, 2012 3 commits
    • unknown's avatar
    • unknown's avatar
      Merge MariaDB 10.0-base -> 10.0 · 49b1d95e
      unknown authored
      49b1d95e
    • 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
  5. 15 Nov, 2012 1 commit
  6. 11 Nov, 2012 1 commit
  7. 09 Nov, 2012 1 commit
    • Vladislav Vaintroub's avatar
      MDEV-3847 : MSI installer does not work. · 718b556f
      Vladislav Vaintroub authored
      - Fix bug in bootstrapper. 
      
      - Also, delete innodb log files cafter bootstrapping , to workaround
      "different log size" Innodb error during the first service start by MSI. 
      This is a temporary measure, in the future innodb will allow handling 
      different file size more gracefully.
      718b556f
  8. 06 Nov, 2012 1 commit
    • Vladislav Vaintroub's avatar
      MDEV-3839 : on Solaris 10, KILLing slave thread has no effect. · 679b8dc1
      Vladislav Vaintroub authored
      The reason for the error is missing definition for SIGNAL_WITH_IO_CLOSE on this platform
      which now needs to  always be defined, as in 5.6
      
      On Solaris10 only, this preprocessor constant was not defined,  thus code that shutdowns a socket in THD::awake was not executed, and polling thread was not interrupted.
      
      Fix is to always define SIGNAL_WITH_IO_CLOSE, just like MySQL5.6 does.
      679b8dc1
  9. 05 Nov, 2012 1 commit
  10. 04 Nov, 2012 4 commits
  11. 03 Nov, 2012 2 commits
    • Sergey Petrunya's avatar
      # MDEV-3817: Wrong result with index_merge+index_merge_intersection, InnoDB... · be0be7af
      Sergey Petrunya authored
      # MDEV-3817: Wrong result with index_merge+index_merge_intersection, InnoDB table, join, AND and OR conditions
      Reconcile the fixes from:
      #
      # guilhem.bichot@oracle.com-20110805143029-ywrzuz15uzgontr0
      # Fix for BUG#12698916 - "JOIN QUERY GIVES WRONG RESULT AT 2ND EXEC. OR
      # AFTER FLUSH TABLES [-INT VS NULL]"
      #
      # guilhem.bichot@oracle.com-20111209150650-tzx3ldzxe1yfwji6
      # Fix for BUG#12912171 - ASSERTION FAILED: QUICK->HEAD->READ_SET == SAVE_READ_SET
      # and
      #
      and related fixes from: BUG#1006164, MDEV-376:
      
      Now, ROR-merged QUICK_RANGE_SELECT objects make no assumptions about the values
      of table->read_set and table->write_set.
      Each QUICK_ROR_SELECT has (and had before) its own column bitmap, but now, all 
      QUICK_ROR_SELECT's functions that care: reset(), init_ror_merged_scan(), and 
      get_next()  will set table->read_set when invoked and restore it back to what 
      it was before the call before they return.
      
      This allows to avoid the mess when somebody else modifies table->read_set for 
      some reason.
      
      
      be0be7af
    • Sergei Golubchik's avatar
      merge with 5.5 · 40e94a37
      Sergei Golubchik authored
      40e94a37
  12. 02 Nov, 2012 2 commits
  13. 31 Oct, 2012 3 commits
  14. 30 Oct, 2012 5 commits
  15. 29 Oct, 2012 6 commits
  16. 28 Oct, 2012 1 commit
  17. 27 Oct, 2012 4 commits