← 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: 2009-05-15 07:16:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1021.
  • Revision ID: brian@gaz-20090515071635-chkog3hw0ht2f8mw
A number of random cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1717
1717
                       &share, sizeof(*share),
1718
1718
                       &key_buff, key_length,
1719
1719
                       NULL))
1720
 
    return(NULL);
 
1720
    return NULL;
1721
1721
 
1722
1722
  table->s= share;
1723
1723
  share->set_table_cache_key(key_buff, key, key_length);
1728
1728
  if (my_hash_insert(&open_cache, (unsigned char*)table))
1729
1729
  {
1730
1730
    free((unsigned char*) table);
1731
 
    return(NULL);
 
1731
    return NULL;
1732
1732
  }
1733
1733
 
1734
1734
  return(table);
2136
2136
        if (!(table= table_cache_insert_placeholder(session, key, key_length)))
2137
2137
        {
2138
2138
          pthread_mutex_unlock(&LOCK_open);
2139
 
          return(NULL);
 
2139
          return NULL;
2140
2140
        }
2141
2141
        /*
2142
2142
          Link placeholder to the open tables list so it will be automatically
2157
2157
    if (table == NULL)
2158
2158
    {
2159
2159
      pthread_mutex_unlock(&LOCK_open);
2160
 
      return(NULL);
 
2160
      return NULL;
2161
2161
    }
2162
2162
 
2163
2163
    error= open_unireg_entry(session, table, table_list, alias, key, key_length);
2165
2165
    {
2166
2166
      free(table);
2167
2167
      pthread_mutex_unlock(&LOCK_open);
2168
 
      return(NULL);
 
2168
      return NULL;
2169
2169
    }
2170
2170
    my_hash_insert(&open_cache,(unsigned char*) table);
2171
2171
  }
3613
3613
      if (nj_col)
3614
3614
      {
3615
3615
        my_error(ER_NON_UNIQ_ERROR, MYF(0), name, session->where);
3616
 
        return(NULL);
 
3616
        return NULL;
3617
3617
      }
3618
3618
      nj_col= curr_nj_col;
3619
3619
    }
3620
3620
  }
3621
3621
  if (!nj_col)
3622
 
    return(NULL);
 
3622
    return NULL;
3623
3623
  {
3624
3624
    /* This is a base table. */
3625
3625
    assert(nj_col->table_ref->table == nj_col->table_field->table);