← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-15 15:17:19 UTC
  • mto: This revision was merged to the branch mainline in revision 2408.
  • Revision ID: olafvdspek@gmail.com-20110815151719-8jp69yf9tbv89kvc
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
58
58
 
59
59
bool is_primary_key(KeyInfo *key_info)
60
60
{
61
 
  static const char * primary_key_name="PRIMARY";
62
 
  return (strcmp(key_info->name, primary_key_name)==0);
 
61
  return strcmp(key_info->name, "PRIMARY") == 0;
63
62
}
64
63
 
65
64
const char* is_primary_key_name(const char* key_name)
66
65
{
67
 
  static const char * primary_key_name="PRIMARY";
68
 
  if (strcmp(key_name, primary_key_name)==0)
69
 
    return key_name;
70
 
  else
71
 
    return NULL;
 
66
  return strcmp(key_name, "PRIMARY") == 0 ? key_name : NULL;
72
67
}
73
68
 
74
69
static bool check_if_keyname_exists(const char *name,KeyInfo *start, KeyInfo *end);