1. 01 Jul, 2010 1 commit
    • Jon Olav Hauglid's avatar
      A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE · f646c889
      Jon Olav Hauglid authored
      DATABASE with open HANDLER"
      
      Remove LOCK_create_db, database name locks, and use metadata locks instead.
      This exposes CREATE/DROP/ALTER DATABASE statements to the graph-based
      deadlock detector in MDL, and paves the way for a safe, deadlock-free
      implementation of RENAME DATABASE.
      
      Database DDL statements will now take exclusive metadata locks on
      the database name, while table/view/routine DDL statements take
      intention exclusive locks on the database name. This prevents race
      conditions between database DDL and table/view/routine DDL.
      (e.g. DROP DATABASE with concurrent CREATE/ALTER/DROP TABLE)
      
      By adding database name locks, this patch implements
      WL#4450 "DDL locking: CREATE/DROP DATABASE must use database locks" and
      WL#4985 "DDL locking: namespace/hierarchical locks".
      
      The patch also changes code to use init_one_table() where appropriate.
      The new lock_table_names() function requires TABLE_LIST::db_length to
      be set correctly, and this is taken care of by init_one_table().
      
      This patch also adds a simple template to help work with 
      the mysys HASH data structure.
      
      Most of the patch was written by Konstantin Osipov.
      f646c889
  2. 30 Jun, 2010 2 commits
  3. 29 Jun, 2010 2 commits
    • Konstantin Osipov's avatar
      Salvage comments added by Ingo while working on · 725c1b86
      Konstantin Osipov authored
      Bug#52114 and Bug#50788.
      The bugs themselves are regressions that are introduced
      by an incomplete fix for Bug#36171 and will not be pushed.
      725c1b86
    • Konstantin Osipov's avatar
      A fix for Bug#54811 "Assert in mysql_lock_have_duplicate()". · ef27df51
      Konstantin Osipov authored
      Remove mysql_lock_have_duplicate(), since now we always
      have TABLE_LIST objects for MyISAMMRG children
      in lex->query_tables and keep it till the end of the
      statement (sub-statement).
      
      
      mysql-test/r/merge.result:
        Update results (Bug#54811).
      mysql-test/t/merge-big.test:
        Update to new wait state.
      mysql-test/t/merge.test:
        Add a test case for Bug#54811.
      sql/lock.cc:
        Remove a function that is now unused.
      sql/lock.h:
        Remove a function that is now unused.
      sql/sql_base.cc:
        Don't try to search for duplicate table among THR_LOCK objects, TABLE_LIST list contains all used tables.
      ef27df51
  4. 28 Jun, 2010 2 commits
  5. 26 Jun, 2010 3 commits
    • Jon Olav Hauglid's avatar
      Bug #49891 View DDL breaks REPEATABLE READ · d4358514
      Jon Olav Hauglid authored
      The problem was that if a query accessing a view was blocked due to
      conflicting locks on tables in the view definition, it would be possible
      for a different connection to alter the view definition before the view
      query completed. When the view query later resumed, it used the old view
      definition. This meant that if the view query was later repeated inside
      the same transaction, the two executions of the query would give different
      results, thus breaking repeatable read. (The first query used the old
      view definition, the second used the new view definition).
      
      This bug is no longer repeatable with the recent changes to the metadata
      locking subsystem (revno: 3040). The view query will no longer back-off
      and release the lock on the view definiton. Instead it will wait for
      the conflicting lock(s) to go away while keeping the view definition lock.
      This means that it is no longer possible for a concurrent connection to
      alter the view definition. Instead, any such attempt will be blocked.
      
      In the case from the bug report where the same view query was executed
      twice inside the same transaction, any ALTER VIEW from other connections
      will now be blocked until the transaction has completed (or aborted).
      The view queries will therefore use the same view definition and we will
      have repeatable read.
      
      Test case added to innodb_mysql_lock.test.
      This patch contains no code changes.
      d4358514
    • Alexander Nozdrin's avatar
      Make few tests experimental. · 11c672d0
      Alexander Nozdrin authored
      11c672d0
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk. · c81dffe5
      Alexander Nozdrin authored
      c81dffe5
  6. 25 Jun, 2010 5 commits
    • Gleb Shchepa's avatar
      5fe5b5f4
    • Alexander Nozdrin's avatar
      Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111 · 5879001b
      Alexander Nozdrin authored
         Bug#47633 - assert in ha_myisammrg::info during OPTIMIZE
       
         The server crashed on an attempt to optimize a MERGE table with
         non-existent child table.
       
         mysql_admin_table() relied on the table to be successfully open
         if a table object had been allocated.
       
         Changed code to check return value of the open function before
         calling a handler:: function on it.
      
      mysql-test/r/merge.result:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
            Bug#47633 - assert in ha_myisammrg::info during OPTIMIZE
            Updated result file.
      mysql-test/t/merge.test:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
            Bug#47633 - assert in ha_myisammrg::info during OPTIMIZE
            Changed tests to respect changed TEMPORARY MERGE locking (unrelated).
            Changed tests to respect changed CREATE TABLE ... LIKE (unrelated).
            Changed tests to respect that no new tables can be created
            under LOCK TABLE (unrelated).
            Added test for Bug#47633.
        Changed error numbers to symbolic names.
        Added test for child locking for ALTER under LOCK TABLE.
        
        Since Bug 36171 is not pushed yet, not the whole patch has been backported.
      mysys/my_delete.c:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
            Bug#47633 - assert in ha_myisammrg::info during OPTIMIZE
            Fixed error reporting.
            Fixed indentation.
      mysys/my_mmap.c:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
            Bug#47633 - assert in ha_myisammrg::info during OPTIMIZE
            Added DBUG.
      sql/item_func.cc:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
        Added Debug Sync point, required by merge_sync.test.
      sql/sql_table.cc:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
            Bug#47633 - assert in ha_myisammrg::info during OPTIMIZE
            Do not call handler:: functions if the table was not opened
            successfully.
        Added Debug Sync point, required by merge_sync.test.
      storage/myisam/mi_check.c:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
            Bug#47633 - assert in ha_myisammrg::info during OPTIMIZE
            Unmap memory before exchanging data files. Needed on Windows.
      storage/myisammrg/ha_myisammrg.cc:
        Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111
        Added Debug Sync point, required by merge_sync.test.
        
        merge_sync.test will be introduced by a patch for Bug 36171,
        which is not pushed yet.
      5879001b
    • Konstantin Osipov's avatar
      Merge trunk -> trunk-runtime · 90331fab
      Konstantin Osipov authored
      90331fab
    • Jon Olav Hauglid's avatar
      Bug #50124 Rpl failure on DROP table with concurrent txn/non-txn · 8a8c5c35
      Jon Olav Hauglid authored
                 DML flow and SAVEPOINT
      
      The problem was that replication could break if a transaction involving
      both transactional and non-transactional tables was rolled back to a
      savepoint. It broke if a concurrent connection tried to drop a
      transactional table which was locked after the savepoint was set.
      This DROP TABLE completed when ROLLBACK TO SAVEPOINT was executed as the
      lock on the table was dropped by the transaction. When the slave later
      tried to apply the binlog, it would fail as the table would already
      have been dropped.
      
      The reason for the problem is that transactions involving both
      transactional and non-transactional tables are written fully to the
      binlog during ROLLBACK TO SAVEPOINT. At the same time, metadata locks
      acquired after a savepoint, were released during ROLLBACK TO SAVEPOINT.
      This allowed a second connection to drop a table only used between
      SAVEPOINT and ROLLBACK TO SAVEPOINT. Which caused the transaction binlog
      to refer to a non-existing table when it was written during ROLLBACK
      TO SAVEPOINT.
      
      This patch fixes the problem by not releasing metadata locks when
      ROLLBACK TO SAVEPOINT is executed if binlogging is enabled.
      8a8c5c35
    • Jon Olav Hauglid's avatar
      Bug #53757 assert in mysql_truncate_by_delete · f51f7740
      Jon Olav Hauglid authored
      The assert was triggered if a connection executing TRUNCATE
      on a InnoDB table was killed during open_tables.
      
      This bug was fixed in the scope of Bug #45643
      "InnoDB does not support replication of TRUNCATE TABLE".
      
      This patch adds test coverage to innodb_mysql_sync.test.
      f51f7740
  7. 23 Jun, 2010 10 commits
    • Joerg Bruehe's avatar
      Merge bug fix. · 9a3c7eab
      Joerg Bruehe authored
      9a3c7eab
    • Joerg Bruehe's avatar
      Fix Bug #54739 · 04f695ec
      Joerg Bruehe authored
      Accidental change in compile-time definitions for FreeBSD
      
      
      Revert the accidental setting of "HAVE_BROKEN_REALPATH"
      on current versions of FreeBSD,
      
      do it for both autotools ("configure.in")
      and cmake ("cmake/os/FreeBSD.cmake").
      04f695ec
    • Jon Olav Hauglid's avatar
      Backport from mysql-6.0-codebase of: · e2d8e31b
      Jon Olav Hauglid authored
      ------------------------------------------------------------
      revno: 3672
      committer: lars-erik.bjork@sun.com
      branch nick: 48067-mysql-6.0-codebase-bugfixing
      timestamp: Mon 2009-10-26 13:51:43 +0100
      message:
        This is a patch for bug#48067
        "A temp table with the same name as an existing table, makes drop
        database fail"
              
        When dropping the database, mysql_rm_known_files() reads the contents
        of the database directory, and creates a TABLE_LIST object, for each
        .frm file encountered. Temporary tables, however, are not associated 
        with any .frm file.
              
        The list of tables to drop are passed to mysql_rm_table_part2().
        This method prefers temporary tables over regular tables, so if
        there is a temporary table with the same name as a regular, the
        temporary is removed, leaving the regular table intact.
        Regular tables are only deleted if there are no temporary tables
        with the same name.
              
        This fix ensures, that for all TABLE_LIST objects that are created
        by mysql_rm_known_files(), 'open_type' is set to 'OT_BASE_ONLY', to
        indicate that this is a regular table. In all cases in
        mysql_rm_table_part2() where we prefer a temporary table to a
        non-temporary table, we chek if 'open_type' equals 'OT_BASE_ONLY'.
      
      
      mysql-test/r/temp_table.result:
        The expected result of the test.
      mysql-test/t/temp_table.test:
        Test based on the bug report.
      sql/sql_db.cc:
        For all TABLE_LIST objects that are created by mysql_rm_known_files(),
        'open_type' is set to 'OT_BASE_ONLY', to indicate that these are
        regular tables.
      sql/sql_table.cc:
        Check if 'open_type' is set to 'OT_BASE_ONLY, every place a temporary table is
        preferred to a non-temporary table.
      e2d8e31b
    • Luis Soares's avatar
      WL#5408: adding skip-test-list to mysql-trunk.push and mysql-next-mr.push · f03fa5a9
      Luis Soares authored
      collections. Originally, they had only been added to default.push, so
      trees named after mysql-[trunk|next-mr] would not skip those tests.
      f03fa5a9
    • Luis Soares's avatar
    • Luis Soares's avatar
    • Luis Soares's avatar
      f9098bc8
    • sunanda's avatar
      Updated the version number · d86ca393
      sunanda authored
      d86ca393
    • sunanda's avatar
    • Tor Didriksen's avatar
      Backport of Bug#53236 Segfault in DTCollation::set(DTCollation&) · abaed739
      Tor Didriksen authored
      Don't call member functions for a NIL pointer.
      
      
      mysql-test/r/subselect4.result:
        Add test case.
      mysql-test/t/subselect4.test:
        Add test case.
      sql/sql_select.cc:
        If the (virtual) member function clone_item() returns NULL,
        there is no substitution to be made, and we don't need to set the collation.
        The test was invoking Item_cache::clone_item()
      abaed739
  8. 22 Jun, 2010 6 commits
    • Gleb Shchepa's avatar
      Bug #30584: delete with order by and limit clauses does not · 5070029c
      Gleb Shchepa authored
                  use limit efficiently
      Bug #36569: UPDATE ... WHERE ... ORDER BY... always does a
                  filesort even if not required
      
      Also two bugs reported after QA review (before the commit
      of bugs above to public trees, no documentation needed):
      
      Bug #53737: Performance regressions after applying patch
                  for bug 36569
      Bug #53742: UPDATEs have no effect after applying patch
                  for bug 36569
      
      
      Execution of single-table UPDATE and DELETE statements did not use the 
      same optimizer as was used in the compilation of SELECT statements. 
      Instead, it had an optimizer of its own that did not take into account 
      that you can omit sorting by retrieving rows using an index.
      
      Extra optimization has been added: when applicable, single-table 
      UPDATE/DELETE statements use an existing index instead of filesort. A 
      corresponding SELECT query would do the former.
      
      Also handling of the DESC ordering expression has been added when
      reverse index scan is applicable.
      
      From now on most single table UPDATE and DELETE statements show the 
      same disk access patterns as the corresponding SELECT query. We verify 
      this by comparing the result of SHOW STATUS LIKE 'Sort%
      
      Currently the get_index_for_order function 
      a) checks quick select index (if any) for compatibility with the
         ORDER expression list or
      b) chooses the cheapest available compatible index, but only if 
         the index scan is cheaper than filesort.
      Second way is implemented by the new test_if_cheaper_ordering
      function (extracted part the test_if_skip_sort_order()).
      
      
      
      mysql-test/r/log_state.result:
        Updated result for optimized query, bug #36569.
      mysql-test/r/single_delete_update.result:
        Test case for bug #30584, bug #36569 and bug #53742.
      mysql-test/r/update.result:
        Updated result for optimized query, bug #30584.
        Note:
        "Handler_read_last 1" omitted, see bug 52312:
        lost Handler_read_last status variable.
      mysql-test/t/single_delete_update.test:
        Test case for bug #30584, bug #36569 and bug #53742.
      sql/opt_range.cc:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
        
        * get_index_for_order() has been rewritten entirely and moved
          to sql_select.cc
        
        New QUICK_RANGE_SELECT::make_reverse method has been added.
      sql/opt_range.h:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
        
        * get_index_for_order() has been rewritten entirely and moved
          to sql_select.cc
        
        New functions:
        * QUICK_SELECT_I::make_reverse()
        * SQL_SELECT::set_quick()
      sql/records.cc:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
        
        * init_read_record_idx() has been modified to allow reverse index scan
        
        New functions:
        * rr_index_last()
        * rr_index_desc()
      sql/records.h:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
        
        init_read_record_idx() has been modified to allow reverse index scan
      sql/sql_delete.cc:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
            
        mysql_delete: an optimization has been added to skip
        unnecessary sorting with ORDER BY clause where select
        result ordering is acceptable.
      sql/sql_select.cc:
        Bug #30584, bug #36569, bug #53737, bug #53742:
          UPDATE/DELETE ... WHERE ... ORDER BY...  always does a filesort
          even if not required
            
        The const_expression_in_where function has been modified
        to accept both Item and Field pointers.
        
        New functions:
        * get_index_for_order()
        * test_if_cheaper_ordering() has been extracted from
          test_if_skip_sort_order() to share with get_index_for_order()
        * simple_remove_const()
      sql/sql_select.h:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
            
        New functions:
        * test_if_cheaper_ordering()
        * simple_remove_const()
        * get_index_for_order()
      sql/sql_update.cc:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
            
        mysql_update: an optimization has been added to skip
        unnecessary sorting with ORDER BY clause where a select
        result ordering is acceptable.
      sql/table.cc:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
        
        New functions:
        * TABLE::update_const_key_parts()
        * is_simple_order()
      sql/table.h:
        Bug #30584, bug #36569: UPDATE/DELETE ... WHERE ... ORDER BY...
                                always does a filesort even if not required
        
        New functions:
        * TABLE::update_const_key_parts()
        * is_simple_order()
      5070029c
    • Vladislav Vaintroub's avatar
      Fix syntax error (missing space in SET command), that effectively prevents... · 6302cb60
      Vladislav Vaintroub authored
      Fix syntax error (missing space in SET command),  that effectively prevents mysqld from being build with SSL.
      6302cb60
    • Vladislav Vaintroub's avatar
      Fix ~1000 warnings class/struct mismatch. · 3b127383
      Vladislav Vaintroub authored
      Handle this warning in the future as error, this will prevent pushing to main trees.
      3b127383
    • Alexander Nozdrin's avatar
      Auto-merge (empty) from mysql-trunk. · 9dfe5eb1
      Alexander Nozdrin authored
      9dfe5eb1
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · bf67973d
      Alexander Nozdrin authored
      bf67973d
    • Magne Mahre's avatar
      Post-push fixups for WL#5349 · b9f03130
      Magne Mahre authored
      
      mysql-test/suite/perfschema/t/no_threads-master.opt:
        Innodb will start multiple threads, which is
        not compatible with --one-thread.   Disable
        innodb to be able to run the test case.
      b9f03130
  9. 21 Jun, 2010 3 commits
  10. 20 Jun, 2010 1 commit
    • Magne Mahre's avatar
      Post-push fixup for WL#5349 · 7858ea88
      Magne Mahre authored
      InnoDB came in a new version "simultanously" with the
      commit.  This patch is a minor change to the new innodb
      regression test suite. 
      7858ea88
  11. 18 Jun, 2010 3 commits
    • Konstantin Osipov's avatar
      A new implementation for the TABLE_SHARE cache in MDL · 4ae9db9c
      Konstantin Osipov authored
      subsystem. Fix a number of caveates that the previous
      implementation suffered from, including unprotected
      access to shared data and lax resource accounting
      (share->ref_count) that could lead to deadlocks.
      
      The new implementation still suffers from a number
      of potential deadlocks in some edge cases, and this is 
      still not enabled by default. Especially since performance
      testing has shown that it gives only marginable (not even 
      exceeding measuring accuracy) improvements.
      
      @todo: 
      - Remove calls to close_cached_tables() with REFRESH_FAST,
      and have_lock, because they break the MDL cache. 
      - rework FLUSH TABLES <list> to not use close_cached_tables()
      - make sure that whenever we set TABLE_SHARE::version to
      0 we free MDL cache references to it.
      
      
      sql/mdl.cc:
        We may cache references to TABLE_SHARE objects in 
        MDL_lock objects for tables. Create a separate
        MDL_lock class to represent a table.
      sql/mdl.h:
        Adjust the MDL caching API to avoid races.
      sql/sql_base.cc:
        Move all caching functionality close together.
        Implement a solution for deadlocks caused by 
        close_cached_tables() when MDL cache is enabled (incomplete).
      sql/sql_yacc.yy:
        Adjust FLUSH rule to do the necessary initialization of
        TABLE_LIST elements used in for FLUSH TABLES <list>, and thus
        work OK with flush_mdl_cache() function.
      4ae9db9c
    • Daniel Fischer's avatar
      merge · c3ad8222
      Daniel Fischer authored
      c3ad8222
    • Joerg Bruehe's avatar
      Automerge from parent copy. · 17dde95f
      Joerg Bruehe authored
      17dde95f
  12. 17 Jun, 2010 2 commits
    • Magne Mahre's avatar
      WL#5349 Change default storage engine to InnoDB · 6884c955
      Magne Mahre authored
      The default storage engine is changed from MyISAM to
      InnoDB, in all builds except for the embedded server.
      
      In addition, the following system variables are 
      changed:
      
        * innodb_file_per_table is enabled
        * innodb_strict_mode is enabled
        * innodb_file_format_name_update is changed
          to 'Barracuda'
      
      The test suite is changed so that tests that do not
      explicitly include the have_innodb.inc are run with
      --default-storage-engine=MyISAM.  This is to ease the
      transition, so that most regression tests are run
      with the same engine as before.
      
      Some tests are disabled for the embedded server
      regression test, as the output of certain statements
      will be different that for the regular server
      (i.e SELECT @@default_storage_engine).  This is to
      ease transition.
      
      
      
      mysql-test/mysql-test-run.pl:
        The regression test suite now adds a
        --default-storage-engine=MyISAM for all non-innodb 
        tests.  This behaviour can be controlled by the
        default-myisam switch in mysql-test-run
      mysql-test/t/bootstrap-master.opt:
        The bootstrap test can only be run without InnoDB
        as it starts several mysqld instances on the same
        datadir. This is possible with MyISAM, but not
        with InnoDB.
      storage/innobase/CMakeLists.txt:
        Build InnoDB per default
      storage/innobase/handler/ha_innodb.cc:
        Change default values for system variables
        
          Enable file_per_table
          Enable strict_mode
          Upgrade default file format to Barracuda
      6884c955
    • Joerg Bruehe's avatar
      Bug#54590 "make_binary_distribution" fails because a command · ea8ba9ff
      Joerg Bruehe authored
      line exceeds the limit
      
      Merge the fix into "trunk-bugfixing".
      ea8ba9ff