← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2010-10-24 01:34:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1875.
  • Revision ID: brian@tangent.org-20101024013439-w9r8qtmt5ihnqtkd
Encapsulate table_name from table_list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
401
401
      bool found= false;
402
402
      for (TableList *table= tables; table; table= table->next_local)
403
403
      {
404
 
        TableIdentifier identifier(table->getSchemaName(), table->table_name);
 
404
        TableIdentifier identifier(table->getSchemaName(), table->getTableName());
405
405
        if (remove_table_from_cache(session, identifier,
406
406
                                    RTFC_OWNED_BY_Session_FLAG))
407
407
        {
592
592
  {
593
593
    if ((table->table == 0 || table->table->getShare()->getType() == message::Table::STANDARD) &&
594
594
        strcasecmp(table->getSchemaName(), db_name) == 0 &&
595
 
        strcasecmp(table->table_name, table_name) == 0)
 
595
        strcasecmp(table->getTableName(), table_name) == 0)
596
596
      break;
597
597
  }
598
598
  return table;
664
664
    assert(table);
665
665
  }
666
666
  d_name= table->getSchemaName();
667
 
  t_name= table->table_name;
 
667
  t_name= table->getTableName();
668
668
  t_alias= table->alias;
669
669
 
670
670
  for (;;)
972
972
bool Session::reopen_name_locked_table(TableList* table_list)
973
973
{
974
974
  Table *table= table_list->table;
975
 
  char *table_name= table_list->table_name;
976
975
 
977
976
  safe_mutex_assert_owner(LOCK_open.native_handle());
978
977
 
979
978
  if (killed || not table)
980
979
    return true;
981
980
 
982
 
  TableIdentifier identifier(table_list->getSchemaName(), table_list->table_name);
983
 
  if (open_unireg_entry(this, table, table_name, identifier))
 
981
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
 
982
  if (open_unireg_entry(this, table, table_list->getTableName(), identifier))
984
983
  {
985
984
    table->intern_close_table();
986
985
    return true;
1143
1142
  if (killed)
1144
1143
    return NULL;
1145
1144
 
1146
 
  TableIdentifier identifier(table_list->getSchemaName(), table_list->table_name);
 
1145
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
1147
1146
  const TableIdentifier::Key &key(identifier.getKey());
1148
1147
  TableOpenCacheRange ppp;
1149
1148
 
1180
1179
  {
1181
1180
    if (flags & DRIZZLE_OPEN_TEMPORARY_ONLY)
1182
1181
    {
1183
 
      my_error(ER_NO_SUCH_TABLE, MYF(0), table_list->getSchemaName(), table_list->table_name);
 
1182
      my_error(ER_NO_SUCH_TABLE, MYF(0), table_list->getSchemaName(), table_list->getTableName());
1184
1183
      return NULL;
1185
1184
    }
1186
1185
 
1346
1345
 
1347
1346
        if (table_list->isCreate())
1348
1347
        {
1349
 
          TableIdentifier  lock_table_identifier(table_list->getSchemaName(), table_list->table_name, message::Table::STANDARD);
 
1348
          TableIdentifier  lock_table_identifier(table_list->getSchemaName(), table_list->getTableName(), message::Table::STANDARD);
1350
1349
 
1351
1350
          if (not plugin::StorageEngine::doesTableExist(*this, lock_table_identifier))
1352
1351
          {
1997
1996
     * to see if it exists so that an unauthorized user cannot phish for
1998
1997
     * table/schema information via error messages
1999
1998
     */
2000
 
    TableIdentifier the_table(tables->getSchemaName(), tables->table_name);
 
1999
    TableIdentifier the_table(tables->getSchemaName(), tables->getTableName());
2001
2000
    if (not plugin::Authorization::isAuthorized(getSecurityContext(),
2002
2001
                                                the_table))
2003
2002
    {