← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/locking/global.cc

  • Committer: Monty Taylor
  • Date: 2011-01-12 21:31:39 UTC
  • mto: (2081.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2082.
  • Revision ID: mordred@inaugust.com-20110112213139-65ivcqxyydejcvr3
Removed some redundant declarations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/locking/global.cc
76
76
  Change to use malloc() ONLY when using LOCK TABLES command or when
77
77
  we are forced to use mysql_lock_merge.
78
78
*/
79
 
#include <config.h>
80
 
 
 
79
#include "config.h"
81
80
#include <fcntl.h>
82
 
 
83
81
#include <drizzled/error.h>
84
82
#include <drizzled/my_hash.h>
85
83
#include <drizzled/thr_lock.h>
86
84
#include <drizzled/session.h>
87
85
#include <drizzled/sql_base.h>
88
86
#include <drizzled/lock.h>
89
 
#include <drizzled/pthread_globals.h>
90
 
#include <drizzled/internal/my_sys.h>
91
 
#include <drizzled/pthread_globals.h>
92
 
#include <drizzled/refresh_version.h>
93
 
#include <drizzled/plugin/storage_engine.h>
 
87
#include "drizzled/pthread_globals.h"
 
88
#include "drizzled/internal/my_sys.h"
 
89
#include "drizzled/pthread_globals.h"
94
90
 
95
91
#include <set>
96
92
#include <vector>
620
616
 
621
617
int Session::lock_table_name(TableList *table_list)
622
618
{
623
 
  identifier::Table identifier(table_list->getSchemaName(), table_list->getTableName());
624
 
  const identifier::Table::Key &key(identifier.getKey());
 
619
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
 
620
  const TableIdentifier::Key &key(identifier.getKey());
625
621
 
626
622
  {
627
623
    /* Only insert the table if we haven't insert it already */
1041
1037
    if (getKilled())
1042
1038
      result=1;
1043
1039
  }
1044
 
 
1045
1040
  if (not abort_on_refresh && not result)
1046
1041
    protect_against_global_read_lock++;
1047
1042