1. 06 Mar, 2012 3 commits
    • Sergei Golubchik's avatar
      5.3 merge · 18c51eee
      Sergei Golubchik authored
      18c51eee
    • Igor Babaev's avatar
      Merge. · f92cfdb8
      Igor Babaev authored
      f92cfdb8
    • Igor Babaev's avatar
      Fixed LP bug #946055. · 04ee30e7
      Igor Babaev authored
      The function create_hj_key_for_table() that builds the descriptor of
      the hash join key to access a table of a materialized subquery must
      ignore any equi-join predicate depending on the tables not belonging
      to the subquery.
      04ee30e7
  2. 05 Mar, 2012 7 commits
    • Sergei Golubchik's avatar
      compilation warning: unused variable · 68aa3edd
      Sergei Golubchik authored
      68aa3edd
    • Sergei Golubchik's avatar
      mdev-20: INSTALL PLUGIN SONAME · 1c530b36
      Sergei Golubchik authored
      1c530b36
    • Michael Widenius's avatar
      Automatic merge · 4ab7a33e
      Michael Widenius authored
      4ab7a33e
    • Michael Widenius's avatar
      Ensure that we mark all processed tables as 'properly closed'. · c4375068
      Michael Widenius authored
      This is needed as last log entry may be a DDL that is not processed and then a table may be left in 'not properly closed state' even if information is correct in it.
      c4375068
    • Sergei Golubchik's avatar
      updates after writing https://kb.askmonty.org/en/mysql-test-auxiliary-files · 98141ea4
      Sergei Golubchik authored
      mysql-test/README.suites:
        removed. it was turned into a manual, eventually
      mysql-test/include/default_mysqld.cnf:
        use normal environment variables instead of magic @OPT.vardir
      mysql-test/lib/My/ConfigFactory.pm:
        use normal environment variables instead of magic @OPT.vardir
      mysql-test/mysql-test-run.pl:
        initialize environment variables before parsing the first my.cnf template - it may refer to them
      mysql-test/suite/sphinx/my.cnf:
        use normal environment variables instead of magic @OPT.vardir
      98141ea4
    • unknown's avatar
      Fix for LP BUG#944504 · 8a5940c4
      unknown authored
      Problem is that subquery execution can't be called during prepare/optimize phase.
      
      Also small fix for subquery test suite.
      8a5940c4
    • Igor Babaev's avatar
      Fixed LP bug #944782. · 6f3c39a0
      Igor Babaev authored
      This bug in the function JOIN::drop_unused_derived_keys() could
      leave the internal structures for a materialized derived table
      in an inconsistent state. This led to a not quite correct EXPLAIN
      output when no additional key had been created to access the table.
      It also may lead to more serious consequences: so, the test case
      added with this fix caused a crash in mariadb-5.5.20.  
      6f3c39a0
  3. 03 Mar, 2012 3 commits
  4. 02 Mar, 2012 3 commits
  5. 01 Mar, 2012 6 commits
    • Igor Babaev's avatar
      Merge 5.3->5.5. · 8b469eb5
      Igor Babaev authored
      8b469eb5
    • Sergei Golubchik's avatar
      misc test/result fixes · 29b0b0b5
      Sergei Golubchik authored
      mysql-test/include/have_xtradb.combinations:
        xtradb tests need this I_S table
      mysql-test/lib/mtr_cases.pm:
        fix for .deb and .rpm installations
      29b0b0b5
    • unknown's avatar
      acd7727e
    • unknown's avatar
      Small cleanups: · 118e437d
      unknown authored
       - use thd->in_active_multi_stmt_transaction() for
         @@in_transaction, not THD flag directly
       - use common error_if_in_trans_or_substatement() function for
         all 4 binlog variables that cannot be changed inside
         statement or transaction.
      118e437d
    • unknown's avatar
      22a504f8
    • Igor Babaev's avatar
      Fixed LP bug #943543. · 000deedf
      Igor Babaev authored
      This bug appeared after the patch for bug 939009 that in the
      function merge_key_fields forgot to reset a proper value for
      the val field in the result of the merge operation of the key
      field created for a regular key access and  the key field
      created to look for a NULL key.
      
      Adjusted the results of the test case for bug 939009 that
      actually were incorrect. 
      000deedf
  6. 29 Feb, 2012 3 commits
  7. 28 Feb, 2012 9 commits
    • Michael Widenius's avatar
      Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable... · e4e85cd2
      Michael Widenius authored
      Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table"
      Fixed wrong mutex order bug in Aria when flush_log_for_bitmap() was called when table is not yet marked for change.
      
      include/my_base.h:
        Added flag that table is opened only for status
      mysql-test/r/myisam-big.result:
        Test case for lp:925377
      mysql-test/t/myisam-big.test:
        Test case for lp:925377
      sql/sql_base.cc:
        If thd->version == 0 (happens only when we are opening a table that is flushed under  MYSQL_LOCK_IGNORE_FLUSH), open the table in HA_OPEN_FOR_STATUS mode
      storage/maria/ma_bitmap.c:
        Fixed wrong mutex order bug in Aria when flush_log_for_bitmap() was called when table is not yet marked for change.
      storage/maria/ma_dbug.c:
        Ignore last_version <= 1 as these are either flushed or only opened for status
      storage/maria/ma_open.c:
        Use last_version=1 as a marker that table was opened with HA_OPEN_FOR_STATUS.
        In this case we just open a new version of the table in read only mode.
      storage/myisam/mi_create.c:
        Update prototype
      storage/myisam/mi_dbug.c:
        Ignore last_version <= 1 as these are either flushed or only opened for status
      storage/myisam/mi_open.c:
        Use last_version=1 as a marker that table was opened with HA_OPEN_FOR_STATUS.
        If HA_OPEN_FOR_STATUS is used, we will not assert if there is an old not-to-be-used version of the table existing.
        In this case we just open a new version of the table in read only mode.
      storage/myisam/myisamdef.h:
        Updated prototype
      e4e85cd2
    • Igor Babaev's avatar
      Addressed all review feedbacks for mwl #247. · 2521ac0c
      Igor Babaev authored
      2521ac0c
    • Vladislav Vaintroub's avatar
      Update copyright notices · 4e8bb265
      Vladislav Vaintroub authored
      4e8bb265
    • Sergei Golubchik's avatar
      lp:938977 - Query performance with join/index super slow on MariaDB 5.3.4RC · 54f9fe6c
      Sergei Golubchik authored
      make sure that stored routines are evaluated (that is, de facto - cached) in convert_const_to_int().
      revert the fix for lp:806943 because it cannot be repeated anymore.
      add few tests for convert_const_to_int()
      54f9fe6c
    • Sergei Golubchik's avatar
      merge · 45faabf4
      Sergei Golubchik authored
      45faabf4
    • Vladislav Vaintroub's avatar
      merge threadpool · ec89275d
      Vladislav Vaintroub authored
      ec89275d
    • Michael Widenius's avatar
      Automatic merge · adf3deda
      Michael Widenius authored
      adf3deda
    • Michael Widenius's avatar
      Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'" · cf06b29f
      Michael Widenius authored
      The issue was that Aria allowed too long keys to be created (so that the internal buffer was not big enough to hold the whole key).
      Key lengths is now limited to HA_MAX_KEY_LENGTH (1000), as for MyISAM.
      Fixed failure in  "_ma_apply_redo_index: Assertion `new_page_length == 0", as found by buildbot.
      
      mysql-test/suite/maria/r/maria.result:
        Updated results
      mysql-test/suite/maria/r/maria3.result:
        Updated results. Added test for bug fix
      mysql-test/suite/maria/t/maria3.test:
        Updated results. Added test for bug fix
      mysql-test/suite/maria/t/optimize.test:
        Updated test for new max key length
      storage/maria/ha_maria.cc:
        Limit key to HA_MAX_KEY_LENGTH.
      storage/maria/ma_key_recover.c:
        Limit used page length to max page size (this is in line with the code that writes the entry to the log).
        This fixes failure in  "_ma_apply_redo_index: Assertion `new_page_length == 0", as found by buildbot.
      storage/maria/ma_search.c:
        Extra DBUG
      storage/maria/ma_write.c:
        Added test to detect errors earlier.
      cf06b29f
    • Igor Babaev's avatar
      Merge. · 9db23c82
      Igor Babaev authored
      9db23c82
  8. 27 Feb, 2012 4 commits
  9. 26 Feb, 2012 2 commits