1. 18 Aug, 2010 8 commits
  2. 17 Aug, 2010 10 commits
    • Joerg Bruehe's avatar
      Merge the fix for bug#55015. · 48bc7c02
      Joerg Bruehe authored
      48bc7c02
    • Marko Mäkelä's avatar
      A non-functional change: · 085bb22a
      Marko Mäkelä authored
      dict_load_index_low(): Rename the parameter "cached" to "allocated"
      and clarify the comments.
      085bb22a
    • Vasil Dimov's avatar
      Make main.endspace more deterministic · 026d301f
      Vasil Dimov authored
      Followup to vasil.dimov@oracle.com-20100817063430-inglmzgdtj95t29d
      which didn't fully fix the test because the order of the returned
      rows was different in embedded and non-embedded version. So the only
      way to fix this is to add an ORDER BY clause.
      026d301f
    • Magne Mahre's avatar
      Bug #54850 rpl_ndb.rpl_ndb_stm_innodb and · 968902dd
      Magne Mahre authored
                 rpl_ndb.rpl_ndb_2other fails
      
      The two regressions tests failed after WL#5349 was
      pushed, since they were writted with the implicit
      requirement that MyISAM is the default storage engine.
      
      Adding --default-storage-engine=MyISAM as startup
      parameter, to mimic the pre-wl#5349 situation.
      
      
      mysql-test/suite/rpl_ndb/t/disabled.def:
        Re-enabling rpl_ndb_stm_innodb and rpl_ndb_2other
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt:
        Setting MyISAM as default storage engine
        explicitly
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt:
        The slave also needs to be started with
        MyISAM as default engine.
      968902dd
    • Jimmy Yang's avatar
      Fix bug #53496 Use Lock_time in slow query log output for InnoDB row · b17b122b
      Jimmy Yang authored
      lock wait time. Including the InnoDB lock time in the exiting "Lock_time"
      output.
      b17b122b
    • Vasil Dimov's avatar
      Adjust endspace.result · 524e0dc4
      Vasil Dimov authored
      This is a followup to vasil.dimov@oracle.com-20100816142329-yimenbuktd416z1a
      which improved the sampling algorithm. The endspace test is non-deterministic
      because it does not include ORDER BY clause in its queries.
      524e0dc4
    • Vasil Dimov's avatar
      Adjust type_bit_innodb.result · 8e168c5c
      Vasil Dimov authored
      This is a followup to vasil.dimov@oracle.com-20100816142329-yimenbuktd416z1a
      which improved the sampling algorithm.
      8e168c5c
    • Vasil Dimov's avatar
      Adjust rowid_order_innodb.result · f0ba35c6
      Vasil Dimov authored
      This is a followup to vasil.dimov@oracle.com-20100816142329-yimenbuktd416z1a
      which improved the sampling algorithm.
      f0ba35c6
    • Vasil Dimov's avatar
      Adjust innodb_gis.result · aed93f87
      Vasil Dimov authored
        
      This is a followup to vasil.dimov@oracle.com-20100816142329-yimenbuktd416z1a
      which improved the sampling algorithm.
      aed93f87
    • Vasil Dimov's avatar
      Adjust innodb_mysql.result · 393aaa4c
      Vasil Dimov authored
      This is a followup to vasil.dimov@oracle.com-20100816142329-yimenbuktd416z1a
      which improved the sampling algorithm. I have manually checked that the new
      values are actually the correct ones, for example:
      -rows	16
      +rows	32
      the number of rows returned by the query is 32.
      393aaa4c
  3. 16 Aug, 2010 9 commits
    • Mattias Jonsson's avatar
      merge · d7cfada0
      Mattias Jonsson authored
      d7cfada0
    • Mattias Jonsson's avatar
    • Vasil Dimov's avatar
      Fix Bug#53761 RANGE estimation for matched rows may be 200 times different · 7f62ec7b
      Vasil Dimov authored
      Improve the range estimation algorithm.
      
      Previously:
      For a given level the algo knows the number of pages in the requested range and the n
      
      With this change:
      Same idea, but peek a few (10) of the intermediate pages to get a better estimate of 
      
      In the bug report one of the examples has a btree with a snippet of the leaf level li
      page1(899 records), page2(1 record), page3(1 record), page4(1 record)
      so when trying to estimate, the previous algo, assumed there are average (899+1)/2=45
      Fix Bug#53761 RANGE estimation for matched rows may be 200 times different
      
      Improve the range estimation algorithm.
      
      Previously:
      For a given level the algo knows the number of pages in the requested range
      and the number of records on the leftmost and the rightmost page. Then it
      assumes all pages in between contain the average between the two border pages
      and multiplies this average number by the number of intermediate pages.
      
      With this change:
      Same idea, but peek a few (10) of the intermediate pages to get a better
      estimate of the average number of records per page. If there are less than 10
      intermediate pages then all of them will be scanned and the result will be
      precise, not an estimation.
      
      In the bug report one of the examples has a btree with a snippet of the leaf
      level like this:
      page1(899 records), page2(1 record), page3(1 record), page4(1 record)
      so when trying to estimate, the previous algo, assumed there are average
      (899+1)/2=450 records per page which went terribly wrong. With this change
      page2 and page3 will be read and the exact number of records will be returned.
      
      Approved by:	Sunny (rb://401)
      7f62ec7b
    • Magne Mahre's avatar
      Bug#55001 Change in behavior: thread_concurrency (docs, · a3b9557b
      Magne Mahre authored
                example files)
      
      The system variable 'thread_concurrency' has been
      (re-)enabled on all platforms, to prevent startup
      errors.
      
      'thread_concurrency' is unused and has no effect,
      on any platform, in MySQL 5.1 and later versions.  It 
      will be deprecated, and removed, in context of 
      worklog WL#5265
      
      
      mysql-test/include/have_thread_concurrency.inc:
        include/have_thread_concurrency.inc was only needed
        to support platforms that didn't have the
        thread_concurrency variable available.  Since the
        variable is now available on all platforms, the file
        is removed.
      a3b9557b
    • Mattias Jonsson's avatar
      merge · d1243d4e
      Mattias Jonsson authored
      d1243d4e
    • Mattias Jonsson's avatar
      Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait for · 4b20ccaf
      Mattias Jonsson authored
                 locks on the table
      
      Fixing the partitioning specifics after TRUNCATE TABLE in
      bug-42643 was fixed.
      
      Reorganize of code to decrease the size of the giant switch
      in mysql_execute_command, and to prepare for future parser
      reengineering. Moved code into Sql_statement objects.
      
      Updated patch according to davi's review comments.
      
      libmysqld/CMakeLists.txt:
        Added new files.
      libmysqld/Makefile.am:
        Added new files.
      mysql-test/r/not_partition.result:
        now returning error on partitioning commands
        if partitioning is not enabled.
      mysql-test/r/partition_disabled.result:
        There is no partition handlerton, so it cannot
        find the specified engine in the .frm file.
      mysql-test/r/partition_truncate.result:
        Updated test results.
      mysql-test/suite/parts/inc/partition_mgm.inc:
        Added check that TRUNCATE PARTITION does not delete on failure.
      mysql-test/suite/parts/r/partition_debug_sync_innodb.result:
        updated results.
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result:
        updated results.
      mysql-test/suite/parts/r/partition_mgm_lc1_archive.result:
        updated results.
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
        updated results.
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test:
        Test case for this bug.
      mysql-test/t/not_partition.test:
        Added check for TRUNCATE PARTITION without partitioning.
      mysql-test/t/partition_truncate.test:
        Added test of TRUNCATE PARTITION on non partitioned table.
      sql/CMakeLists.txt:
        Added new files.
      sql/Makefile.am:
        Added new files.
      sql/datadict.cc:
        Moved out the storage engine check into an own
        function, including assert for lock.
      sql/datadict.h:
        added dd_frm_storage_engine.
      sql/sql_alter_table.cc:
        moved the code for SQLCOM_ALTER_TABLE in mysql_execute_command
        into its own file, and using the Sql_statement object to
        prepare for future parser reengineering.
      sql/sql_alter_table.h:
        Created Sql_statement object for ALTER TABLE.
      sql/sql_lex.cc:
        resetting m_stmt.
      sql/sql_lex.h:
        Temporary hack for forward declaration of enum_alter_table_change_level.
      sql/sql_parse.cc:
        Moved out ALTER/ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE
        from the giant switch into their own Sql_statement
        objects.
      sql/sql_parse.h:
        Exporting check_merge_table_access.
      sql/sql_partition_admin.cc:
        created Sql_statement for
        ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR/TRUNCATE
        PARTITION. To be able to reuse the TABLE equivalents.
      sql/sql_partition_admin.h:
        Added Sql_statement of partition admin statements.
      sql/sql_table.cc:
        Moved table maintenance code into sql_table_maintenance.cc
      sql/sql_table.h:
        Moved table maintenance code into sql_table_maintenance.h
        exporting functions used by sql_table_maintenance.
      sql/sql_table_maintenance.cc:
        Moved table maintenance code from sql_table.cc
      sql/sql_table_maintenance.h:
        Sql_statement objects for ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE.
        Also declaring the keycache functions.
      sql/sql_truncate.cc:
        Moved code from SQLCOM_TRUNCATE in mysql_execute_command into
        Truncate_statement::execute.
        Added check for partitioned table on TRUNCATE PARTITION.
        Moved locking fix for partitioned table into
        Alter_table_truncate_partition::execute.
      sql/sql_truncate.h:
        Truncate_statement declaration (sub class of Sql_statement).
      sql/sql_yacc.yy:
        Using the new Sql_statment objects.
      4b20ccaf
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5. · 98f69947
      Alexander Nozdrin authored
      98f69947
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5. · aadd4957
      Alexander Nozdrin authored
      aadd4957
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5-stage. · 32edab6b
      Alexander Nozdrin authored
      32edab6b
  4. 14 Aug, 2010 1 commit
    • Evgeny Potemkin's avatar
      Bug#49746: Const expression caching led to NDB not using engine condition · 827a8999
      Evgeny Potemkin authored
      pushdown.
            
      NDB supports only a limited set of item nodes for use in engine condition
      pushdown. Because of this adding cache for const expression effectively
      disabled this optimization.
            
      The ndb_serialize_cond function is extended to support Item_cache and treat
      it as a constant values.
      A helper function called ndb_serialize_const is added. It is used to create
      Ndb_cond value node from given const item.
      
      
      mysql-test/suite/ndb/t/disabled.def:
        Bug#49746: Const expression caching led to NDB not using engine condition
        pushdown.
        Enabled ndb_condition_pushdown test after fixing appropriate bug.
      sql/ha_ndbcluster_cond.cc:
        Bug#49746: Const expression caching led to NDB not using engine condition
        pushdown.
        The ndb_serialize_cond function is extended to support Item_cache and treat
        it as a constant values.
        A helper function called ndb_serialize_const is added. It is used to create
        Ndb_cond value node from given const item.
      sql/item.cc:
        Bug#49746: Const expression caching led to NDB not using engine condition
        pushdown.
        The Item::cache_const_expr_analyzer function is adjusted to not create
        cache for Item_int_with_ref objects.
      sql/item.h:
        Bug#49746: Const expression caching led to NDB not using engine condition
        pushdown.
        The result_type() method is added to Item_cache class.
        The Item_cache_str now initializes its collation.
      827a8999
  5. 13 Aug, 2010 9 commits
    • Inaam Rana's avatar
      Change default for innodb_strict_mode to FALSE. · 1a649603
      Inaam Rana authored
      Note that this was originally pushed by Calvin but the was later
      reverted by mistake.
      
      bug#54702
      1a649603
    • Inaam Rana's avatar
    • Konstantin Osipov's avatar
      Bug#52117 "Pending FLUSH TALBES <list> aborts transactions unnecessarily" · 5c7ac4aa
      Konstantin Osipov authored
      The bug was fixed by the patch for Bug 52044.
      Add a test case.
      
      mysql-test/r/flush.result:
        Update results (Bug#52117)
      mysql-test/t/flush.test:
        Add a test case for Bug#52117 "Pending FLUSH TALBES <list> aborts
        transactions unnecessarily"
      5c7ac4aa
    • Alexander Nozdrin's avatar
      Disable test cases due to Bug 55966. · 427efc3a
      Alexander Nozdrin authored
      427efc3a
    • Konstantin Osipov's avatar
      Extract reload_acl_and_cache() and flush_tables_with_read_lock() · 8ce6e98a
      Konstantin Osipov authored
      into an own implementation file.
      8ce6e98a
    • Jon Olav Hauglid's avatar
      7c3de33a
    • Mattias Jonsson's avatar
      merge · 0058f16d
      Mattias Jonsson authored
      0058f16d
    • Jon Olav Hauglid's avatar
      Bug #54105 assert in MDL_context::release_locks_stored_before · 99b1d5ea
      Jon Olav Hauglid authored
      The problem was that SHOW CREATE EVENT released all metadata locks
      held by the current transaction. This made any exisiting savepoints
      invalid, triggering the assert when ROLLBACK TO SAVEPOINT later
      was executed.
      
      This patch fixes the problem by making sure SHOW CREATE EVENT only
      releases metadata locks acquired by the statement itself.
      
      Test case added to event_trans.test.
      99b1d5ea
    • Mattias Jonsson's avatar
      Bug#53676: Unexpected errors and possible table · daf0e6b7
      Mattias Jonsson authored
                 corruption on ADD PARTITION and LOCK TABLE
      Bug#53770: Server crash at handler.cc:2076 on
                 LOAD DATA after timed out COALESCE PARTITION
      
      5.5 fix for:
      Bug#51042: REORGANIZE PARTITION can leave table in an
                 inconsistent state in case of crash
      Needs to be back-ported to 5.1
      
      5.5 fix for:
      Bug#50418: DROP PARTITION does not interact with
                 transactions
      
      Main problem was non-persistent operations done
      before meta-data lock was taken (53770+53676).
      And 53676 needed to keep the table/partitions opened and locked
      while copying the data to the new partitions.
      
      Also added thorough tests to spot some additional bugs
      in the ddl_log code, which could result in bad state
      between the .frm and partitions.
      
      Collapsed patch, includes all fixes required from the reviewers.
      
      mysql-test/r/partition_innodb.result:
        updated result with new test
      mysql-test/suite/parts/inc/partition_crash.inc:
        crash test include file
      mysql-test/suite/parts/inc/partition_crash_add.inc:
        test all states in fast_alter_partition_table
        ADD PARTITION branch
      mysql-test/suite/parts/inc/partition_crash_change.inc:
        test all states in fast_alter_partition_table
        CHANGE PARTITION branch
      mysql-test/suite/parts/inc/partition_crash_drop.inc:
        test all states in fast_alter_partition_table
        DROP PARTITION branch
      mysql-test/suite/parts/inc/partition_fail.inc:
        recovery test including injecting errors
      mysql-test/suite/parts/inc/partition_fail_add.inc:
        test all states in fast_alter_partition_table
        ADD PARTITION branch
      mysql-test/suite/parts/inc/partition_fail_change.inc:
        test all states in fast_alter_partition_table
        CHANGE PARTITION branch
      mysql-test/suite/parts/inc/partition_fail_drop.inc:
        test all states in fast_alter_partition_table
        DROP PARTITION branch
      mysql-test/suite/parts/inc/partition_mgm_crash.inc:
        include file that runs all crash and failure injection tests.
      mysql-test/suite/parts/r/partition_debug_innodb.result:
        new test result file
      mysql-test/suite/parts/r/partition_debug_myisam.result:
        new test result file
      mysql-test/suite/parts/r/partition_special_innodb.result:
        updated result
      mysql-test/suite/parts/r/partition_special_myisam.result:
        updated result
      mysql-test/suite/parts/t/partition_debug_innodb-master.opt:
        opt file for using with crashing tests of partitioned innodb
      mysql-test/suite/parts/t/partition_debug_innodb.test:
        partitioned innodb test that require debug builds
      mysql-test/suite/parts/t/partition_debug_myisam-master.opt:
        opt file for using with crashing tests of partitioned myisam
      mysql-test/suite/parts/t/partition_debug_myisam.test:
        partitioned myisam test that require debug builds
      mysql-test/suite/parts/t/partition_special_innodb-master.opt:
        added innodb-file-per-table to easier verify partition status on disk
      mysql-test/suite/parts/t/partition_special_innodb.test:
        added test case
      mysql-test/suite/parts/t/partition_special_myisam.test:
        added test case
      mysql-test/t/partition_innodb.test:
        added test case
      sql/sql_base.cc:
        Moved alter_close_tables to sql_partition.cc
      sql/sql_base.h:
        removed some non existing and duplicated functions.
      sql/sql_partition.cc:
        fast_alter_partition_table:
        Spletted abort_and_upgrad_lock_and_close_table
        to its parts (wait_while_table_is_used and
        alter_close_tables) and always have
        wait_while_table_is_used before any persistent
        operations (including logs, which will be executed
        on failure) and alter_close_tables after
        create/read/write operations and before
        drop operations.
        
        moved alter_close_tables here from sql_base.cc
        
        Added error injections for better test coverage.
        
        write_log_final_change_partition:
        fixed a log_entry linking bug (delete_frm was not
        linked to change/drop partition)
        and drop partition must be executed before
        change partition (change partition can rename a
        partition to an old name, like REORG p1 INTO (p1,p2).
        
        write_log_add_change_partition:
        need to use drop_frm first, and relinking that entry
        and reusing its execute entry.
      sql/sql_table.cc:
        added initialization of next_active_log_entry.
      sql/table.h:
        removed a duplicate declaration.
      daf0e6b7
  6. 12 Aug, 2010 3 commits