• Konstantin Osipov's avatar
    A post-review fix for type-aware metadata locks. · 09b7a0d1
    Konstantin Osipov authored
    DDL no longer aborts mysql_lock_tables(), and hence
    we no longer need to support need_reopen flag of this
    call. 
    Remove the flag, and all the code in the server
    that was responsible for handling the case when
    it was set. This allowed to simplify: 
    open_and_lock_tables_derived(), the delayed thread,
    multi-update.
    
    Rename MYSQL_LOCK_IGNORE_FLUSH to MYSQL_OPEN_IGNORE_FLUSH,
    since we now only support this flag in open_table().
    
    Rename MYSQL_LOCK_PERF_SCHEMA to MYSQL_LOCK_LOG_TABLE,
    to avoid confusion.
    
    Move the wait for the global read lock for cases
    when we do updates in SELECT f1() or DO (UPDATE) to 
    open_table() from mysql_lock_tables(). When waiting
    for the read lock, we could raise need_reopen flag,
    which is no longer present in mysql_lock_tables().
    Since the block responsible for waiting for GRL
    was moved, MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK
    was renamed to MYSQL_OPEN_IGNORE_GLOBAL_READ_LOCK.
    
    
    mysql-test/r/mdl_sync.result:
      Update test results (see comments for mdl_sync.test).
    mysql-test/t/mdl_sync.test:
      Update tests: an abort mysql_lock_tables() called for an
      INSERT no longer auto-closes SQL HANDLERS, since it
      no longer leads to back-off and retry.
    sql/ha_ndbcluster_binlog.cc:
      Remove unused variables.
    sql/lock.cc:
      Remove support for need_reopen parameter of mysql_lock_tables().
      Update comments.
    sql/log_event_old.cc:
      Remove the loop responsible for handling need_reopen
      out parameter of mysql_lock_tables().
    sql/mysql_priv.h:
      Update open and lock tables flag names.
    sql/share/errmsg-utf8.txt:
      Add a new error message to report when
      thr_multi_lock() is aborted.
    sql/sql_base.cc:
      Update comments. Rename MYSQL_LOCK_IGNORE_FLUSH
      to MYSQL_OPEN_IGNORE_FLUSH.
    sql/sql_class.h:
      Remove unused code.
    sql/sql_db.cc:
      Remove an unused bit of code.
    sql/sql_handler.cc:
      For backward compatibility, we still want to back off and
      retry when a call to mysql_lock_tables() is aborted
      from within an SQL HANDLER. Write an internal error
      handler to support the case.
    sql/sql_insert.cc:
      Call mysql_lock_tables() no longer has need_reopen
      out parameter. Simplify the code by removing 
      the crud that took care of it.
      MYSQL_LOCK_IGNORE_FLUSH is now only supported by
      open_tables().
    sql/sql_show.cc:
      Rename MYSQL_LOCK_IGNORE_FLUSH to MYSQL_OPEN_IGNORE_FLUSH
    sql/sql_table.cc:
      Remove an unused parameter.
    sql/sql_update.cc:
      Remove the need_reopen loop from multi-update.
      We no also longer need to cleanup the parse tree in case
      when mysql_lock_tables() is aborted and thus an infinite
      source of multi-update bugs is gone.
    sql/tztime.cc:
      Rename MYSQL_LOCK_IGNORE_FLUSH to MYSQL_OPEN_IGNORE_FLUSH,
      since from now on this flag is only supported by open_table().
    09b7a0d1
sql_base.cc 287 KB