1. 03 Dec, 2009 11 commits
    • Konstantin Osipov's avatar
      Backport of: · cd155be5
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 3035.4.1
      committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
      branch nick: 39897-6.0
      timestamp: Thu 2009-01-15 12:17:57 -0200
      message:
      Bug#39897: lock_multi fails in pushbuild: timeout waiting for processlist
      
      The problem is that relying on the "Table lock" thread state in
      its current position to detect that a thread is waiting on a lock
      is race prone. The "Table lock" state change happens before the
      thread actually tries to grab a lock on a table.
      
      The solution is to move the "Table lock" state so that its set
      only when a thread is actually going to wait for a lock. The state
      change happens after the thread fails to grab the lock (because it
      is owned by other thread) and proceeds to wait on a condition.
      
      This is considered part of work related to WL#4284 "Transactional
      DDL locking"
      Warning: this patch contains an incompatible change. 
      When waiting on a lock in thr_lock.c, the server used to display "Locked"
      processlist state. After this patch, the state is "Table lock".
      The new state was actually intended to be display since year 2002,
      when Monty added it. But up until removal of thd->locked boolean
      member, this state was ignored by SHOW PROCESSLIST code.  
      
      mysql-test/r/lock_multi.result:
        A style fix.
      mysql-test/r/sp-threads.result:
        Changed output of SHOW PROCESSLIST (new wait state).
      mysql-test/t/lock_multi.test:
        Use a more accurate state description when waiting inside thr_lock.c.
      mysql-test/t/lock_sync.test:
        Use a more accurate state description when waiting inside thr_lock.c.
      mysql-test/t/multi_update.test:
        Use a more accurate state description when waiting inside thr_lock.c.
      mysql-test/t/query_cache_28249.test:
        Use a more accurate state description when waiting inside thr_lock.c.
      mysql-test/t/sp_notembedded.test:
        Use a more accurate state description when waiting inside thr_lock.c.
      mysql-test/t/status.test:
        Use a more accurate state description when waiting inside thr_lock.c.
      mysys/thr_lock.c:
        Update thread state while waiting for a table lock.
      sql/lock.cc:
        State change was moved inside thr_lock.c.
      cd155be5
    • Konstantin Osipov's avatar
      Backport of: · f9f2bd19
      Konstantin Osipov authored
      -----------------------------------------------------------
      2497.479.10 Sergei Golubchik    2008-08-27
                  proc_info_hook, mysys access to thd->proc_info
      
      This patch is necessary for backport of WL#4284 "Transactional
      DDL locking".
      
      
      include/my_global.h:
        proc_info_hook
      include/my_sys.h:
         proc_info_hook
      mysys/my_static.c:
        proc_info_hook
      sql/mysqld.cc:
        proc_info_hook
      sql/sql_class.cc:
        proc_info_hook
      f9f2bd19
    • Konstantin Osipov's avatar
      Backport of: · c52d4830
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.22.3
      committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
      branch nick: 4284-6.0
      timestamp: Thu 2008-08-07 22:33:43 -0300
      message:
      WL#4284: Transactional DDL locking
      
      Make transaction management more modular through a new interface.
      
      The overall objective of this change is to provide groundwork
      for the design of transactional DDL locking by cleaning up the
      transaction high level API to better distinguish operations implicit
      and explicit, and single statement transaction from operations on
      the normal transaction.
      
      Having a a high-level interface for transaction management provides
      a better base for implementing transactional concepts that are not
      always tied to storage engines and also makes it easier to interect
      with other higher level modules of the server.
      
      client/Makefile.am:
        Add new file to the build.
      libmysqld/CMakeLists.txt:
        Add new file to the build.
      libmysqld/Makefile.am:
        Add new file to the build.
      sql/CMakeLists.txt:
        Add new file to the build.
      sql/Makefile.am:
        Add new file to the build.
      sql/handler.cc:
        Remove multiplexer commit or rollback function. Most callers already
        have enough information to decided whether to rollback or commit.
        Having plain and well named functions makes it easier to read
        and understand code.
      sql/handler.h:
        Remove wrapper function as the low level transaction functions
        shouldn't be called directly anymore.
      sql/log_event.cc:
        Rename transaction management functions to the new names.
      sql/log_event_old.cc:
        Rename transaction management functions to the new names.
      sql/mysql_priv.h:
        Remove obsolete functions for implicit and explicit commit.
      sql/rpl_injector.cc:
        Rename transaction management functions to the new names.
      sql/rpl_rli.cc:
        Rename transaction management functions to the new names.
      sql/set_var.cc:
        Rename transaction management functions to the new names.
      sql/slave.cc:
        Rename transaction management functions to the new names.
      sql/sql_base.cc:
        Rename transaction management functions to the new names.
      sql/sql_class.cc:
        Rename transaction management functions to the new names.
      sql/sql_delete.cc:
        Rename transaction management functions to the new names.
      sql/sql_do.cc:
        Rename transaction management functions to the new names.
      sql/sql_insert.cc:
        Rename transaction management functions to the new names.
      sql/sql_parse.cc:
        Rename transaction management functions to the new names.
      sql/sql_partition.cc:
        Rename transaction management functions to the new names.
      sql/sql_table.cc:
        Rename transaction management functions to the new names.
      sql/transaction.cc:
        Implement wrapper functions to differentiate operations on
        the single statement transaction from the ones operating
        on the normal transaction.
      sql/transaction.h:
        Export new functions for dealing with transaction commands.
      c52d4830
    • Konstantin Osipov's avatar
      Backport of: · 6a5bbd4b
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.13.17
      committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
      branch nick: 4284-6.0
      timestamp: Sun 2008-07-27 10:14:46 -0300
      message:
      Post-merge fixes:
      
      Remove dependency on binlog, require not embedded as test uses
      the event scheduler and disable abort on error for syntax only
      available on servers built with debugging support.
      
      This is a patch in scope of WL#4284 "Transactional DDL locking"
      
      mysql-test/t/implicit_commit.test:
        Remove dependency on binlog, require not embedded as test uses
        the event scheduler and disable abort on error for syntax only
        available on servers built with debugging support.
      6a5bbd4b
    • Konstantin Osipov's avatar
      Backport of: · 3543d255
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.13.16
      committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
      branch nick: WL#4284
      timestamp: Sat 2008-07-26 13:38:20 -0300
      message:
      WL#4284: Transactional DDL locking
      
      SQL statements' effect on transactions.
      
      Currently the MySQL server and its storage engines are not
      capable of rolling back operations that define or modify data
      structures (also known as DDL statements) or operations that
      alter any of the system tables (the mysql database). Allowing
      these group of statements to participate in transactions
      is unfeasible at this time (since rollback has no effect
      whatsoever on them) and goes against the design of our metadata
      locking subsystem.
      
      The solution is to issue implicit commits before and after
      those statements execution. This effectively confines each of
      those statements to its own special transaction and ensures
      that metadata locks taken during this special transaction
      are not leaked into posterior statements/transactions.
      
      
      mysql-test/include/commit.inc:
        Alter table rename was not committing the normal transaction at the
        end of its execution, and as a consequence, the commit was being
        issued in the next DDL command (rename table) that happened to end
        the active transaction. Other changes are to take into account the
        implicit commits issued before and after the DDL command execution.
      mysql-test/include/implicit_commit_helper.inc:
        Add auxiliary test that shows if a statement issued a 
        implicit commit.
      mysql-test/r/commit_1innodb.result:
        
        Update test case result.
      mysql-test/r/implicit_commit.result:
        Test implicit commit behavior of some SQL commands.
      mysql-test/t/implicit_commit.test:
        Test implicit commit behavior of some SQL commands.
      sql/events.cc:
        Transaction is now ended before the command execution.
      sql/mysql_priv.h:
        Add flags array for server commands and remove historical 
        left over.
      sql/sql_class.h:
        Add flags to control when to issue implicit commits before and
        after a command execution.
      sql/sql_delete.cc:
        A implicit commit is issued at the end of truncate
        statements.
      sql/sql_parse.cc:
        Mark commands that need implicit commits before and
        after their executions. The implicit commits of the
        statement and the normal transaction are now issued
        regardless of the user access privileges.
      sql/sql_table.cc:
        A implicit commit is now issued before admin commands.
      tests/mysql_client_test.c:
        Test that COM_REFRESH issues a implicit commit.
      3543d255
    • Konstantin Osipov's avatar
      Backport of: · ec14bfc7
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.2.7
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-runtime
      timestamp: Wed 2008-06-04 15:18:52 +0400
      message:
        Fix a code regression (not observable externally) that I introduced
        in the fix for Bug#26141
      
      (backporting as part of all patches related to WL#3726)
      ec14bfc7
    • Konstantin Osipov's avatar
      WL#3726 "DDL locking", post-review fixes. · 2d4de82f
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.2.23
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-runtime
      timestamp: Fri 2008-06-27 21:15:11 +0400
      message:
        Add an assert that we never call COMMIT or ROLLBACK while having
        a table lock.
      
      sql/sql_parse.cc:
        We should never call COMMIT or ROLLBACK with a table lock, except
        when under LOCK TABLES.
      2d4de82f
    • Konstantin Osipov's avatar
      Merge next-mr -> next-4284 · c659143c
      Konstantin Osipov authored
      c659143c
    • Konstantin Osipov's avatar
      Backport of (WL#3726) · eef538ab
      Konstantin Osipov authored
      ------------------------------------------------------------ 
      revno: 2630.13.4
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-runtime
      timestamp: Mon 2008-07-07 19:51:20 +0400
      message:
        Fixed outdated comment describing mdl_init_lock() function.
      eef538ab
    • Konstantin Osipov's avatar
      Backport of: · 31baae3f
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.39
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Thu 2008-06-26 13:08:27 +0400
      message:
        Fix warnings about passing pointer to not fully-initialized THD
        object to constructor of base Open_tables_state classe, which
        appeared on Windows and were introduced by one of the patches
        implementing WL#3726 "DDL locking for all metadata objects".
      
      sql/sql_class.cc:
        Moved code preparing Open_tables_state instance for operations
        which open/lock/close tables from class constructor to
        init_open_tables_state() method. This allows us to move such
        initialization of base Open_table_state instance in THD class
        constructor from base classes initialization section to
        constructor's body and thus to get rid of warnings about
        about passing pointer to not fully-initialized THD object
        to base class constructor.
      sql/sql_class.h:
        Moved code preparing Open_tables_state instance for operations
        which open/lock/close tables from class constructor to
        init_open_tables_state() method. This allows us to move such
        initialization of base Open_table_state instance in THD class
        constructor from base classes initialization section to
        constructor's body and thus to get rid of warnings about
        about passing pointer to not fully-initialized THD object
        to base class constructor.
      31baae3f
    • Konstantin Osipov's avatar
      Merge next-mr -> next-mr-runtime · 94f25504
      Konstantin Osipov authored
      94f25504
  2. 02 Dec, 2009 10 commits
    • Konstantin Osipov's avatar
      Backport of: · 7f628ac2
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.4.38
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-4144
      timestamp: Wed 2008-06-25 22:07:06 +0400
      message:
        WL#4144 - Lock MERGE engine children.
        Committing a version of the patch merged with WL#3726
        on behalf of Ingo.
      
        Step #1: Move locking from parent to children.
      
        MERGE children are now left in the query list of tables
        after inserted there in open_tables(). So they are locked
        by lock_tables() as all other tables are.
      
        The MERGE parent does not store locks any more. It appears
        in a MYSQL_LOCK with zero lock data. This is kind of a "dummy"
        lock.
      
        All other lock handling is also done directly on the children.
        To protect against parent or child modifications during LOCK
        TABLES, the children are detached after every statement and
        attached before every statement, even under LOCK TABLES.
      
        The children table list is removed from the query list of tables
        on every detach and on close of the parent.
      
        Step #2: Move MERGE specific functionality from SQL layer
        into table handler.
      
        Functionality moved from SQL layer (mainly sql_base.cc)
        to the table handler (ha_myisammrg.cc).
      
        Unnecessary code is removed from the SQL layer.
      
        Step #3: Moved all MERGE specific members from TABLE
        to ha_myisammrg.
      
        Moved members from TABLE to ha_myisammrg.
        Renamed some mebers.
        Fixed comments.
      
        Step #4: Valgrind and coverage testing
      
        Valgrind did not uncover new problems.
        Added purecov comments.
      
        Added a new test for DATA/INDEX DIRECTORY options.
        Changed handling of ::reset() for non-attached children.
        Fixed the merge-big test.
      
        Step #5: Fixed crashes detected during review
        Changed detection when to attach/detach.
        Added new tests.
      
      Backport also the fix for Bug#44040 "MySQL allows creating a 
      MERGE table upon VIEWs but crashes when using it"
      
      
      include/my_base.h:
        WL#4144 - Lock MERGE engine children
        Added HA_EXTRA_ADD_CHILDREN_LIST and HA_EXTRA_IS_ATTACHED_CHILDREN
        for MERGE table support
      mysql-test/r/merge.result:
        WL#4144 - Lock MERGE engine children
        Fixed test result.
      mysql-test/t/disabled.def:
        Enable merge.test, which now is working again (WL#4144).
      mysql-test/t/merge-big.test:
        Fix the messages for wait_condition (merge with WL#3726).
      mysql-test/t/merge.test:
        WL#4144 - Lock MERGE engine children
        Fixed one test to meet coding standards for tests
        (upper case keywords, engine names as in SHOW ENGINES).
        Fixed error codes.
        Added a test for DATA/INDEX DIRECTORY.
      mysys/thr_lock.c:
        WL#4144 - Lock MERGE engine children
        Added purecov comments.
      sql/ha_partition.cc:
        WL#4144 - Lock MERGE engine children
        Added MERGE specific extra operations to ha_partition::extra().
        Extended comments.
        Changed function comment to doxygen style.
        Fixed nomenclature: 'parameter' -> 'operation'.
      sql/mysql_priv.h:
        WL#4144 - Lock MERGE engine children
        Removed declarations for removed functions.
      sql/sql_base.cc:
        WL#4144 - Lock MERGE engine children
        Leave the children in the query list of tables after open_tables().
        Set proper back links (prev_global).
        Attach MERGE children before and detach them after every
        statement. Even under LOCK TABLES.
        Remove children from the query list when they are detached.
        Remove lock forwarding from children to parent.
        Moved MERGE specific functions to ha_myisammrg.cc.
        Added purecov comments.
        Backport the fix for Bug#44040 "MySQL allows creating a MERGE table upon VIEWs but crashes when using it"
      sql/sql_table.cc:
        WL#4144 - Lock MERGE engine children
        Changed detection of MERGE tables.
      sql/table.cc:
        WL#4144 - Lock MERGE engine children
        Moved is_children_attached() method from TABLE to ha_myisammrg.
      sql/table.h:
        WL#4144 - Lock MERGE engine children
        Moved all MERGE specific members from TABLE to ha_myisammrg.
      storage/myisammrg/ha_myisammrg.cc:
        WL#4144 - Lock MERGE engine children
        Set proper back links in the child list (prev_global).
        Added a function for removal of the child list from the query list.
        Remove children from the query list when the parent is closed.
        Make parent lock handling a dummy (zero locks).
        Moved MERGE specific functionality from SQL layer to here.
        Moved all MERGE specific members from TABLE to ha_myisammrg.
        Renamed children list pointers.
        Added initialization and free for the children list mem_root.
        Fixed comments.
        Added purecov comments.
      storage/myisammrg/ha_myisammrg.h:
        WL#4144 - Lock MERGE engine children
        Added method add_children_list().
        Moved all MERGE specific members from TABLE to ha_myisammrg.
        Renamed children list pointers.
        Added a mem_root for the children list.
      storage/myisammrg/myrg_extra.c:
        WL#4144 - Lock MERGE engine children
        Changed handling of ::reset() for non-attached children.
      7f628ac2
    • Konstantin Osipov's avatar
      Backport of: · e9129424
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.37
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Wed 2008-06-25 20:28:57 +0400
      message:
        Fix build failure of mysql-6.0-3726 tree on Windows.
      
        The failure was caused by the fact that sql/mdl.cc was
        using __func__ macro without including sql_profile.h
        header which contained definition of this macro for
        those platforms that miss it.
      
        This patch solves this problem by moving this define to
        include/my_global.h which makes it available in modules
        which don't/can't include sql/mysql_priv.h.
      
      This is a patch that is part of WL#3726.
      
      include/my_global.h:
        Moved definition of __func__ macro from sql/sql_profile.h to
        include/my_global.h to make it accessible from those modules
        of the server which don't include mysql_priv.h.
      sql/sql_profile.cc:
        Removed _unknown_func_ const variable since it is no longer used
        by __func__ macro.
      sql/sql_profile.h:
        Moved definition of __func__ macro from sql/sql_profile.h to
        include/my_global.h to make it accessible from those modules
        of the server which don't include mysql_priv.h.
      e9129424
    • Konstantin Osipov's avatar
      Backport of: · 9148af5c
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.4.36
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-3726
      timestamp: Wed 2008-06-25 17:03:37 +0400
      message:
        As per discussion with Serg and Dmitri, remove the code
        that is trying to emulate LOCK TABLES when locking tables for prelocking.
        This code was worked around by the engines, and has no effect.
        We may still have to do something to ensure that statement-based
        replication is consistent in MVCC engines, or other engines
        that downgrade table level locks, but this will have to be done
        somehow differently.
      
      
      sql/sql_base.cc:
        Do not try to emulate LOCK TABLES when locking tables for
        pre-locking.
      9148af5c
    • Konstantin Osipov's avatar
      Backport of: · 77cbfd85
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.4.35
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-3726
      timestamp: Wed 2008-06-25 16:44:00 +0400
      message:
        Fix a MyISAM-specific bug in the new implementation of
        LOCK TABLES (WL#3726).
        If more than one instance of a MyISAM table are open in the
        same connection, all of them must share the same status_param.
        Otherwise, unlock of a table may lead to lost records.
        See also comments in thr_lock.c.
      
      include/thr_lock.h:
         Declare thr_lock_merge_status().
      mysql-test/r/lock.result:
        Update test results (WL#3726).
      mysql-test/t/lock.test:
        Add a test case for the situation when the same table is locked
        twice by LOCK TABLES, and only one instance is updated.
      mysys/thr_lock.c:
        Move the code that makes sure all status_params of the same
        table are shared into a separate function.
      sql/lock.cc:
        Make sure that status_param is shared when a table is reopened.
      77cbfd85
    • Konstantin Osipov's avatar
      Backport of: · 124cda8a
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.33
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Fri 2008-06-20 17:11:20 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After-review fixes in progress.
      
        Minimized dependency of mdl.cc on other modules (particularly
        made it independant of mysql_priv.h) in order to be able
        write unit tests for metadata locking subsystem.
      
      
      sql/ha_ndbcluster_binlog.cc:
        Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
        buffer for object key for metadata locking subsystem.
      sql/log_event.cc:
        Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
        buffer for object key for metadata locking subsystem.
      sql/mdl.cc:
        Removed dependency on THD class (and thus on mysql_priv.h)
        by using direct access to members of st_my_thread_var instead
        of accessing THD::killed/enter_cond()/exit_cond().
      sql/mdl.h:
        Added MAX_MDLKEY_LENGTH constant to be used for allocating
        buffers for key for metadata locking subsystem.
        Added declarations of server kernel functions used by metadata
        locking subsystem to mdl.h in order to decrease dependency of
        mdl.cc on other files.
      sql/mysql_priv.h:
        Moved declaration of notify_thread_having_shared_lock() to the
        mdl.h (also renamed it to make clear in metadata locking code
        that it is a callback to SQL-layer).
      sql/sql_base.cc:
        Renamed notify_thread_having_shared_lock() to make it clear
        in metadata locking subsystem code that it is a callback
        to SQL layer.
      sql/sql_handler.cc:
        Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
        buffer for object key for metadata locking subsystem.
      sql/sql_show.cc:
        Use newly introduced MAX_MDLKEY_LENGTH constant for allocating
        buffer for object key for metadata locking subsystem.
      124cda8a
    • Konstantin Osipov's avatar
      Backport of: · e3b3907c
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.32
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Thu 2008-06-19 16:39:58 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After-review fixes in progress.
      
        Ensure that metadata locking subsystem properly handles
        out-of-memory conditions. Clarified MDL interface by
        separating release of locks and removal of lock requests
        from the context.
      
      sql/lock.cc:
        mdl_release_lock(), mdl_acquire_exclusive_locks() and 
        mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        mdl_remove_lock() to do this.
      sql/mdl.cc:
        Ensured that metadata locking subsystem properly handles
        out-of-memory conditions.
        Introduced new MDL_INITIALIZED state for metadata lock
        request which is used in all cases when lock is not acquired 
        and we have not associated request with object respesenting 
        lock.
        
        MDL_PENDING is now only used for requests for exclusive locks
        which are added to the MDL_LOCK::waiting_exclusive queue.
        mdl_release_lock(), mdl_acquire_exclusive_locks() and 
        mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        newly introduced mdl_remove_lock() to do this.
        Also renamed mdl_release_all_locks_for_name() to 
        emphasize that it also actually removes lock requests
        from the context.
        
        Finally mdl_try_acquire_exclusive_lock() is now returs
        information about encountered lock conflict in separate
        out parameter since its return value is used for distinguishing
        between error (e.g. due to OOM) and success.
      sql/mdl.h:
        Introduced new MDL_INITIALIZED state for metadata lock
        request which is used in all cases when lock is not acquired 
        and we have not associated request with object respesenting 
        lock.
        
        MDL_PENDING is now only used for requests for exclusive locks
        which are added to the MDL_LOCK::waiting_exclusive queue.
        mdl_release_lock(), mdl_acquire_exclusive_locks() and 
        mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        newly introduced mdl_remove_lock() to do this.
        Also renamed mdl_release_all_locks_for_name() to 
        emphasize that it also actually removes lock requests
        from the context.
        
        Finally mdl_try_acquire_exclusive_lock() is now returs
        information about encountered lock conflict in separate
        out parameter since its return value is used for distinguishing
        between error (e.g. due to OOM) and success.
      sql/sql_base.cc:
        mdl_release_lock(), mdl_acquire_exclusive_locks() and mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        mdl_remove_lock() to do this.
        Also adjusted open_table() to ensure that it 
        releases/removes metadata locks in case of error 
        after adding/acquiring them (unless keeping these
        lock requests is required for recovering action).
      sql/sql_delete.cc:
        mdl_release_lock(), mdl_acquire_exclusive_locks() and mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        mdl_remove_lock() to do this.
      sql/sql_handler.cc:
        mdl_release_lock(), mdl_acquire_exclusive_locks() and mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        mdl_remove_lock() to do this.
      sql/sql_show.cc:
        mdl_release_lock(), mdl_acquire_exclusive_locks() and mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        mdl_remove_lock() to do this.
      sql/sql_table.cc:
        Renamed mdl_release_all_locks_for_name() to emphasize
        that it also actually removes lock requests from the context.
        mdl_release_lock(), mdl_acquire_exclusive_locks() and mdl_try_acquire_exclusive_lock() are no longer responsible
        for removal of metadata lock requests from the context.
        One should explicitly call mdl_remove_all_locks() and
        mdl_remove_lock() to do this.
        Finally mdl_try_acquire_exclusive_lock() is now returs
        information about encountered lock conflict in separate
        out parameter since its return value is used for distinguishing
        between error (e.g. due to OOM) and success.
      e3b3907c
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 20b95d08
      Alexander Nozdrin authored
      20b95d08
    • Konstantin Osipov's avatar
      Backport of: · b7e8b016
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.4.31
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-3726
      timestamp: Thu 2008-06-12 06:23:08 +0400
      message:
        Extend the signature of TABLE_LIST::init_one_table() to 
        initialize lengths
      
      This is part of WL#3726 post-review fixes.
      b7e8b016
    • Konstantin Osipov's avatar
      Backport of: · 7585067a
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.4.30
      Konstantin Osipov   2008-06-11
      Fix a potential cause of test failures.
      
      sql/sql_base.cc:
        0 may not be equal to (char*) 0 on 64 bit pointer/32 bit int machines.
      7585067a
    • Konstantin Osipov's avatar
      Backport of: · 3104af49
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.10.1
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-lock-tables-tidyup
      timestamp: Wed 2008-06-11 15:49:58 +0400
      message:
        WL#3726, review fixes.
        Now that we have metadata locks, we don't need to keep a crippled
        TABLE instance in the table cache to indicate that a table is locked.
        Remove all code that used this technique. Instead, rely on metadata
        locks and use the standard open_table() and close_thread_table()
        to manipulate with the table cache tables.
        Removes a list of functions that have become unused (see the comment
        for sql_base.cc for details).
        Under LOCK TABLES, keep a TABLE_LIST instance for each table
        that may be temporarily closed. For that, implement an own class for
        LOCK TABLES mode, Locked_tables_list.
      
      This is a pre-requisite patch for WL#4144.
      This is not exactly a backport: there is no new 
      online ALTER table in Celosia, so the old alter table
      code was changed to work with the new table cache API.
      
      
      mysql-test/r/lock.result:
        Update results (WL#3726 post-review patch).
      mysql-test/r/trigger-compat.result:
        We take the table from the table cache now, thus no warning.
      mysql-test/suite/rpl/r/rpl_trigger.result:
        We take the table from the table cache now, thus no warning.
      mysql-test/t/lock.test:
        Additional tests for LOCK TABLES mode (previously not covered by
        the test suite (WL#3726).
      sql/field.h:
        Remove reopen_table().
      sql/lock.cc:
        Remove an obsolete parameter of mysql_lock_remove().
        It's not used anywhere now either.
      sql/mysql_priv.h:
        Add 4 new open_table() flags.
        Remove declarations of removed functions.
      sql/sp_head.cc:
        Rename thd->mdl_el_root to thd->locked_tables_root.
      sql/sql_acl.cc:
        Use the new implementation of unlock_locked_tables().
      sql/sql_base.cc:
        Implement class Locked_tables_list.
        Implement close_all_tables_for_name().
        Rewrite close_cached_tables() to use the new reopen_tables().
        Remove reopen_table(), reopen_tables(), reopen_table_entry() 
        (ex. open_unireg_entry()), close_data_files_and_leave_as_placeholders(),
        close_handle_and_leave_table_as_placeholder(), close_cached_table(),
        table_def_change_share(), reattach_merge(), reopen_name_locked_table(),
        unlink_open_table().
        
        Move acquisition of a metadata lock into an own function
        - open_table_get_mdl_lock().
      sql/sql_class.cc:
        Deploy class Locked_tables_list.
      sql/sql_class.h:
        Declare class Locked_tables_list.
        Keep one instance of this class in class THD.
        Rename mdl_el_root to locked_tables_root.
      sql/sql_db.cc:
        Update a comment.
      sql/sql_insert.cc:
        Use the plain open_table() to open a just created table in
        CREATE TABLE .. SELECT.
      sql/sql_parse.cc:
        Use thd->locked_tables_list to enter and leave LTM_LOCK_TABLES mode.
      sql/sql_partition.cc:
        Deploy the new method of working with partitioned table locks.
      sql/sql_servers.cc:
        Update to the new signature of unlock_locked_tables().
      sql/sql_table.cc:
        In mysql_rm_table_part2(), the branch that removes a table under
        LOCK TABLES, make sure that the table being dropped
        is also removed from THD::locked_tables_list.
        Update ALTER TABLE and CREATE TABLE LIKE implementation to use
        open_table() and close_all_tables_for_name() instead of 
        reopen_tables().
      sql/sql_trigger.cc:
        Use the new locking way.
      sql/table.h:
        Add TABLE::pos_in_locked_tables, which is used only under
        LOCK TABLES.
      3104af49
  3. 01 Dec, 2009 15 commits
    • Konstantin Osipov's avatar
      Backport of: · e8a9191e
      Konstantin Osipov authored
      ```---------------------------------------------------------
      revno: 2630.9.3
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w3
      timestamp: Wed 2008-06-11 08:33:36 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress.
      
        Changed close_cached_tables() not to flush all unused TABLE
        instances when flushing individual table.
        Renamed expel_table_from_cache() to tdc_remove_table() and
        added enum parameter to be able more explicitly specify type
        of removal, rewrote its code to be more efficient.
      
      ******
      Backport of:
      ```
      
      ---------------------------------------------------------
      revno: 2630.9.4
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w3
      timestamp: Wed 2008-06-11 15:53:53 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After-review fixes in progress.
      
        Minor changes in order to improve code readability
        and simplify debugging.
      
      
      mysql-test/r/ps_ddl.result:
        Restore the original (correct) behaviour,
        now that the patch that fixes the regression
        introduced by the original patch for WL#3726 is fixed.
      mysql-test/t/ps_ddl.test:
        Restore the original (correct) behaviour,
        now that the patch that fixes the regression
        introduced by the original patch for WL#3726 is fixed
      sql/mysql_priv.h:
        Renamed expel_table_from_cache() to tdc_remove_table() 
        and added enum parameter to be able more explicitly specify 
        type of removal.
      sql/sql_base.cc:
        Changed close_cached_tables() not to flush all unused TABLE
        instances when flushing individual table.
        Renamed expel_table_from_cache() to tdc_remove_table() and added
        enum parameter to be able more explicitly specify type of
        removal, rewrote its code to be more efficient. As result removed
        relink_unused() function which is no longer used.
        ******
        Improved code in close_cached_tables() according to reviewer's
        comments.
      sql/sql_delete.cc:
        Renamed expel_table_from_cache() to tdc_remove_table() 
        and added enum parameter to be able more explicitly 
        specify type of removal.
      sql/sql_rename.cc:
        Renamed expel_table_from_cache() to tdc_remove_table() 
        and added enum parameter to be able more explicitly 
        specify type of removal.
      sql/sql_show.cc:
        Moved acquisition of high-prio shared metadata lock in which
        happens in fill_schema_table_from_frm() to separate function.
      sql/sql_table.cc:
        Renamed expel_table_from_cache() to tdc_remove_table() 
        and added enum parameter to be able more explicitly 
        specify type of removal.
      sql/sql_trigger.cc:
        Renamed expel_table_from_cache() to tdc_remove_table() 
        and added enum parameter to be able more explicitly 
        specify type of removal.
      e8a9191e
    • Andrei Elkin's avatar
      Manual resolving for the following files · 0eda4846
      Andrei Elkin authored
      Text conflict in mysql-test/collections/default.experimental
      Text conflict in mysql-test/r/show_check.result
      Text conflict in mysql-test/r/sp-code.result
      Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
      Text conflict in mysql-test/suite/rpl/t/disabled.def
      Text conflict in mysql-test/t/show_check.test
      Text conflict in mysys/my_delete.c
      Text conflict in sql/item.h
      Text conflict in sql/item_cmpfunc.h
      Text conflict in sql/log.cc
      Text conflict in sql/mysqld.cc
      Text conflict in sql/repl_failsafe.cc
      Text conflict in sql/slave.cc
      Text conflict in sql/sql_parse.cc
      Text conflict in sql/sql_table.cc
      Text conflict in sql/sql_yacc.yy
      Text conflict in storage/myisam/ha_myisam.cc
      
      Corrected results for
       stm_auto_increment_bug33029.reject      2009-12-01
      		20:01:49.000000000 +0300
             <andrei> @@ -42,9 +42,6 @@
             <andrei>  RETURN i;
             <andrei>  END//
             <andrei>  CALL p1();
             <andrei> -Warnings:
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
      
      There should be indeed no Note present because there is in fact autoincrement 
      top-level query in sp() that triggers inserting in yet another auto-inc table.
      (todo: alert DaoGang to improve the test).
      0eda4846
    • Alexander Nozdrin's avatar
      A patch for Bug#48915 (After having switched off the ipv6 support in OS, · 273454b9
      Alexander Nozdrin authored
      mysqld crashed in network_init()).
      
      The problem was that current_thd was not ready at that point in mysqld life,
      so ER() macro could not be used.
      
      The fix is to use ER_DEFAULT() macro, which is intented for such cases.
      273454b9
    • Konstantin Osipov's avatar
      Backport of: · f7ba9daf
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.9.2
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w3
      timestamp: Tue 2008-06-10 18:01:56 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress.
      
      
      sql/mdl.cc:
        Changed mdl_acquire_shared_lock() signature to accept MDL_CONTEXT
        as one of arguments as described in specification.
      sql/mdl.h:
        Changed mdl_acquire_shared_lock() signature to accept MDL_CONTEXT
         as one of arguments as described in specification.
      sql/sql_base.cc:
        Changed mdl_acquire_shared_lock() signature to accept MDL_CONTEXT
        as one of arguments as described in specification.
        Renamed handle_failed_open_table_attempt() to
        recover_from_failed_open_table_attempt() as suggested by review.
        Added comment clarifying why we need to check TABLE::db_stat
        while looking at TABLE instances open by other threads.
      sql/sql_show.cc:
        Changed mdl_acquire_shared_lock() signature to accept MDL_CONTEXT
        as one of arguments as described in specification.
      f7ba9daf
    • Konstantin Osipov's avatar
      Backport of: · db3f97c3
      Konstantin Osipov authored
      ------------------------------------------------------------ 
      revno: 2630.9.1 
      committer: Dmitry Lenev <dlenev@mysql.com> 
      branch nick: mysql-6.0-3726-w3 
      timestamp: Sun 2008-06-08 22:13:58 +0400 
      message: 
        WL#3726 "DDL locking for all metadata objects" 
         
        After review fixes in progress. 
         
        Some adjustments to the patch that removes thd->locked_tables
      
      sql/sp_head.cc:
        Fix conditions which were wrongly translated by previous patch.
      sql/sql_base.cc:
        close_thread_tables():
          Add comment clarifying control flow in case of LTM_LOCK_TABLES
          mode and statements requiring prelocking.
          Be consistent with other places where we clear
          OPTION_TABLE_LOCK flag.
        lock_tables():
          Always set THD::lock to 0 after freeing memory to which it
          points.
      db3f97c3
    • Konstantin Osipov's avatar
      Backport of: · 466ee7e5
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.27
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Mon 2008-06-09 14:01:19 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress.
      
        Changed open_table() to return bool. This allows more easily to
        distinguish cases when this function succeeds but returns no TABLE
        instance (in case of view or in case of special kind of open) from
        cases when we have an error. Pointer to TABLE instance is now
        always returned in TABLE_LIST::table member.
      
        This change allows to get rid of false assumption in open_tables()
        implementation and makes it more clear.
      466ee7e5
    • Konstantin Osipov's avatar
      Backport of: · 5969dcda
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.4.26
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-prelocked_mode-to-push
      timestamp: Fri 2008-06-06 23:19:04 +0400
      message:
        WL#3726: work on review comments.
        Remove thd->locked_tables. Always store MYSQL_LOCK instances in
        thd->lock.
        Rename thd->prelocked_mode to thd->locked_tables_mode.
        Use thd->locked_tables_mode to determine if we
        are under LOCK TABLES. Update the code to not assume that
        if thd->lock is set, LOCK TABLES mode is off.
        Review comments.
      
      
      sql/ha_ndbcluster_binlog.cc:
        Don't unlock the lock under LOCK TABLES (safety).
      sql/handler.cc:
        There is no thd->locked_tables any more.
        Update comments.
      sql/lock.cc:
        There is no thd->locked_tables any more.
      sql/log.cc:
        Rename thd->prelocked_mode to thd->locked_tables_mode.
      sql/set_var.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sp_head.cc:
        Rename thd->prelocked_mode to thd->locked_tables_mode.
      sql/sql_base.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
        Remove thd->locked_tables.
      sql/sql_cache.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sql_class.cc:
        Avoid code duplication.
        Do not release the table locks prematurely if we're under LOCK TABLES.
        Use thd->locked_tables_mode instead of thd->locked_tables.
      sql/sql_class.h:
        Remove thd->locked_tables.
        Make prelocked mode a kind of LOCK TABLES mode.
        Update comments.
      sql/sql_cursor.cc:
        Update comments.
      sql/sql_insert.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
        Rename thd->prelocked_mode to thd->locked_tables_mode.
      sql/sql_load.cc:
        Rename thd->prelocked_mode to thd->locked_tables_mode.
      sql/sql_parse.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
        Remove thd->locked_tables.
      sql/sql_partition.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sql_rename.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sql_select.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sql_table.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sql_trigger.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sql_update.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      sql/sql_view.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      storage/myisam/ha_myisam.cc:
        Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
      5969dcda
    • Konstantin Osipov's avatar
      Backport of: · 1b078b3f
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.25
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Fri 2008-06-06 15:32:48 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress.
      
        Clarified some comments explaining control flow in
        prepare_for_repair().
      1b078b3f
    • Konstantin Osipov's avatar
      Backport of: · d0a1f640
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.24
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Fri 2008-06-06 14:28:58 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress.
      
        Get rid of upgradability and priority attributes of
        metadata lock requests by replacing them with two
        new types of lock requests MDL_SHARED_UPGRADABLE and
        MDL_SHARED_HIGH_PRIO correspondingly.
      d0a1f640
    • Konstantin Osipov's avatar
      Backport of: · 9d3c9344
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.22
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Thu 2008-06-05 22:06:48 +0400
      message:
        WL#3726 "DDL locking for all metadata objects"
      
        After review fixes in progress.
      
        Moved code checking that current lock request can be satisfied
        given the current state of individual or global metadata lock
        to separate well-documented functions.
      
      
      sql/mdl.cc:
        Moved code.
      9d3c9344
    • Konstantin Osipov's avatar
      Backport of: · 1480dafe
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.8.3
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w4
      timestamp: Thu 2008-06-05 10:48:36 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After-review fixes in progress.
      
        Adjust some comments that were using old terminology
        (name locks instead of exclusive metadata locks), brought
        some of them up-to-date with current situation in code.
      
      
      sql/sql_base.cc:
        Adjusted comments to use proper terminology.
      sql/sql_delete.cc:
        Adjusted comments to use proper terminology.
      sql/sql_handler.cc:
        Adjusted comments to use proper terminology.
      sql/sql_partition.cc:
        Adjusted comments to use proper terminology also fixed
        one comment to correspond to what really happens in code.
      sql/sql_show.cc:
        Adjusted comments to use proper terminology.
      sql/sql_table.cc:
        Adjusted comments to use proper terminology, brought
         one of them up-to-date with current situation.
      sql/sql_trigger.cc:
        Adjusted comments to use proper terminology.
      sql/table.h:
        Removed two unused members of TABLE_SHARE struct.
      1480dafe
    • Konstantin Osipov's avatar
      Backport of: · 6d5dd315
      Konstantin Osipov authored
      ----------------------------------------------------------
      revno: 2630.2.20
      committer: Konstantin Osipov <konstantin@mysql.com>
      branch nick: mysql-6.0-runtime
      timestamp: Fri 2008-06-27 20:10:42 +0400
      message:
        Fix a regression introduced by WL#3726 when a table was left in the
        table cache after DROP DATABASE.
        Implementation of DROP DATABASE reads a list of files in the database
        directory and constructs from it the list of tables to be dropped.
        If the filesystem is case-insensitive and case-preserving, the
        table names should be lowercased, because the same has been done
        when entries for them were inserted into the table cache.
        Skipping this step will lead to orphaned TABLEs left in the table cache.
        Fixes lowercase_table2 failure on powermacg5.
      
      
      sql/sql_db.cc:
        Lowercase the table name, it's used to construct the table cache
        key.
      6d5dd315
    • Konstantin Osipov's avatar
      Backport of: · 93b55a00
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.20
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Wed 2008-06-04 16:27:06 +0400
      message:
        WL#3726 "DDL locking for all metadata objects"
      
        After review fixes in progress.
      
        Got rid of TABLE_LIST::mdl_upgradable member and related functions
        by using special flag which to be passed to open_table() which
        asks it to take upgradable metadata lock on table being opened.
      
      
      sql/mysql_priv.h:
        Added one more argument to open_n_lock_single_table() call to be
        able to pass flags to open_table() and mysql_lock_tables() called
        by it.
        Added new flag for controlling open_table() behavior asks it to
        take upgradable metadata locks on tables open for write.
      sql/sql_base.cc:
        Added new flag for controlling open_table() behavior asks it to
        take upgradable metadata locks on tables open for write.
        This allowed us to get rid of TABLE_LIST::mdl_upgradable member.
        Added one more argument to open_n_lock_single_table() call to be
        able to pass flags to open_table() and mysql_lock_tables() called
        by it.
      sql/sql_insert.cc:
        Added one more argument to open_n_lock_single_table() call to be
        able to pass flags to open_table() and mysql_lock_tables() called
        by it.
      sql/sql_parse.cc:
        Got rid of TABLE_LIST::mdl_upgradable member by using special flag
        which to be passed to open_table() which asks it to take
        upgradable metadata lock on table being opened.  As result also
        got rid of adjust_mdl_locks_upgradability() function.
      sql/sql_table.cc:
        Got rid of TABLE_LIST::mdl_upgradable member and related functions
        by using special flag which to be passed to open_table() which
        asks it to take upgradable metadata lock on table being opened.
      sql/sql_view.cc:
        Got rid of TABLE_LIST::mdl_upgradable member and related functions
        by using special flag which to be passed to open_table() which
        asks it to take upgradable metadata lock on table being opened.
      sql/table.h:
        Got rid of TABLE_LIST::mdl_upgradable member and related functions
        by using special flag which to be passed to open_table() which
        asks it to take upgradable metadata lock on table being opened.
      93b55a00
    • Konstantin Osipov's avatar
      Backport of: · 1ed585ad
      Konstantin Osipov authored
      ---------------------------------------------
      2630.7.3 Konstantin Osipov       2008-06-02
              Various style changes preceding the removal of reopen_table().
      (Post-review fixes for WL#3726).
      
      
      sql/event_db_repository.cc:
        Update to use the new signature of TABLE_LIST::init_one_table().
      sql/mysql_priv.h:
        Move close_cached_table() and wait_while_table_is_used()
        to sql_base.cc.
      sql/sql_base.cc:
        Move close_cached_table() and wait_while_table_is_used()
        from sql_table.cc.
      sql/sql_table.cc:
        Move close_cached_table() and wait_while_table_is_used()
        to sql_base.cc.
      sql/table.h:
        Update the signature of TABLE_LIST::init_one_table().
      1ed585ad
    • Konstantin Osipov's avatar
      Backport of: · 379a441d
      Konstantin Osipov authored
      ---------------------------------------------------------
      2630.7.2 Konstantin Osipov       2008-06-02
               Fix alignment in sql_table.cc (no other changes).
      
      
      sql/sql_table.cc:
        Fix alignment (no other changes).
      379a441d
  4. 30 Nov, 2009 4 commits
    • Konstantin Osipov's avatar
      Backport of: · b05303c1
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.18
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Tue 2008-06-03 21:07:58 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress.
      
        Now during upgrading/downgrading metadata locks we deal with
        individual metadata lock requests rather than with all requests
        for this object in the context. This makes API a bit more clear
        and makes adjust_mdl_locks_upgradability() much nicer.
      
      
      sql/lock.cc:
        lock_table_names():
          Set TABLE_LIST::mdl_lock_data when allocating new metadata
          lock request object for table list element.
      sql/mdl.cc:
        Now during upgrading/downgrading metadata locks we deal with
        individual metadata lock requests rather than with all
        requests for this object in the context. Adjusted upgrade/
        downgrade functions accordingly.
        We also got rid of mdl_release_exclusive_locks() and
        now release locks individually. To simplify this process
        mdl_release_all_locks_for_name() was introduced.
      sql/mdl.h:
        Now during upgrading/downgrading metadata locks we deal with
        individual metadata lock requests rather than with all
        requests for this object in the context. Adjusted upgrade/
        downgrade functions accordingly.
        We also got rid of mdl_release_exclusive_locks() and
        now release locks individually. To simplify this process
        mdl_release_all_locks_for_name() was introduced.
      sql/sql_base.cc:
        Now during upgrading/downgrading metadata locks we deal with
        individual metadata lock requests rather than with all
        requests for this object in the context.
        We also got rid of mdl_release_exclusive_locks() and
        now release locks individually.
      sql/sql_parse.cc:
        adjust_mdl_locks_upgradability() is much simplier now due to the
        fact that now during upgrading/downgrading metadata locks we
        deal with individual metadata lock requests rather than with
        all requests for this object in the context.
      sql/sql_table.cc:
        Now during upgrading/downgrading metadata locks we deal with
        individual metadata lock requests rather than with all
        requests for this object in the context. Adjusted upgrade/
        downgrade functions accordingly.
        We also got rid of mdl_release_exclusive_locks() and
        now release locks individually. To simplify this process
        mdl_release_all_locks_for_name() was introduced.
      sql/sql_trigger.cc:
        ow during upgrading/downgrading metadata locks we deal with
        individual metadata lock requests rather than with all
        requests for this object in the context.
      b05303c1
    • Konstantin Osipov's avatar
      Backport of: · e23046d1
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.17
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w2
      timestamp: Thu 2008-05-29 16:52:56 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress.
      
        "The great correction of names".
      
        Renamed MDL_LOCK and MDL_LOCK_DATA classes to make usage of
        these names in metadata locking subsystem consistent with
        other parts of server (i.e. thr_lock.cc). Now we MDL_LOCK_DATA
        corresponds to request for a lock and MDL_LOCK to the lock
        itself. Adjusted code in MDL subsystem and other places
        using these classes accordingly.
        Did similar thing for GLOBAL_MDL_LOCK_DATA class and also
        changed name of its members to correspond to names of
        MDL_LOCK_DATA members.
        Finally got rid of usage of one letter variables in MDL
        code since it makes code harder to search in (according
        to reviewer).
      e23046d1
    • Konstantin Osipov's avatar
      Backport of: · cf45b61a
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.16
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w
      timestamp: Thu 2008-05-29 09:45:02 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review changes in progress.
      
        Tweaked some comments and did some renames to
        avoid ambiguites.
      
      
      sql/mysql_priv.h:
        Removed name_lock_locked_table() function.
      sql/sql_base.cc:
        Got rid of name_lock_locked_table() function after replacing
        the only call to it with its body.
        Simplified open_table() code by making "action" argument
        mandatory (i.e. one now should always pass non-0 pointer
        in this argument).
        Renamed TABLE_LIST::open_table_type to open_type to
        avoid confusing it with type of table.
        Adjusted comments according to review.
      sql/sql_handler.cc:
        Added comment clarifying in which cases we can have TABLE::mdl_lock
        set to 0.
      sql/sql_insert.cc:
        Now the 4th argument of open_table() is mandatory (it makes
        no sense to complicate open_table() code when we can simply
        pass dummy variable).
      sql/sql_parse.cc:
        Renamed TABLE_LIST::open_table_type to open_type to
        avoid confusing it with type of table.
      sql/sql_prepare.cc:
        Renamed TABLE_LIST::open_table_type to open_type to
        avoid confusing it with type of table.
      sql/sql_table.cc:
        Now the 4th argument of open_table() is mandatory (it makes
        no sense to complicate open_table() code when we can simply
        pass dummy variable).
      sql/sql_trigger.cc:
        Replaced the only call to name_lock_locked_table() function
        with its body.
      sql/sql_view.cc:
        Renamed TABLE_LIST::open_table_type to open_type to
        avoid confusing it with type of table.
      sql/table.h:
        Renamed TABLE_LIST::open_table_type to open_type (to
        avoid confusing it with type of table) and improved
        comments describing this member.
      cf45b61a
    • Konstantin Osipov's avatar
      Backport of: · 0dcead9f
      Konstantin Osipov authored
      ------------------------------------------------------------
      revno: 2630.4.14
      committer: Dmitry Lenev <dlenev@mysql.com>
      branch nick: mysql-6.0-3726-w
      timestamp: Wed 2008-05-28 12:16:03 +0400
      message:
        WL#3726 "DDL locking for all metadata objects".
      
        After review fixes in progress. Removed unused code and
        adjusted names of functions/methods to better reflect
        their current function.
      
      
      sql/mysql_priv.h:
        Changed names of close_data_files_and_morph_locks() and
        close_handle_and_leave_table_as_lock() to better reflect
        their current function (locking is now responsibility
        of metadata locking subsystem).
      sql/sql_base.cc:
        Changed names of close_data_files_and_morph_locks() and
        close_handle_and_leave_table_as_lock() to better reflect
        their current function (locking is now responsibility
        of metadata locking subsystem). Also adjusted comments
        describing these functions.
        Got rid of TABLE::open_placeholder since it is no longer
        used (its value is never read anywhere).
        TABLE::needs_reopen_or_name_lock() was renamed to needs_reopen()
        since we no longer use name-locks
      sql/sql_handler.cc:
        TABLE::needs_reopen_or_name_lock() was renamed to needs_reopen()
        since we no longer use name-locks.
      sql/sql_insert.cc:
        TABLE::needs_reopen_or_name_lock() was renamed to needs_reopen()
        since we no longer use name-locks
      sql/sql_partition.cc:
        Changed name of close_data_files_and_morph_locks() to
        better reflect its current function (locking is now
        responsibility of metadata locking subsystem).
      sql/sql_table.cc:
        Changed names of close_data_files_and_morph_locks() and
        close_handle_and_leave_table_as_lock() to better reflect
        their current function (locking is now responsibility
        of metadata locking subsystem).
        Got rid of TABLE::open_placeholder since it is no longer
        used.
      sql/sql_trigger.cc:
        Changed name of close_data_files_and_morph_locks() to
        better reflect its current function (locking is now
        responsibility of metadata locking subsystem).
      sql/table.h:
        Got rid of TABLE::open_placeholder which is no longer used
        altough its value was set in several places no code reads it).
        Removed unused TABLE::is_name_opened() method.
        Finally TABLE::needs_reopen_or_name_lock() was renamed to
        needs_reopen() since we no longer use name-locks.
      0dcead9f