• 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
sql_load.cc 56.2 KB