← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Monty Taylor
  • Date: 2008-10-04 18:42:30 UTC
  • Revision ID: monty@inaugust.com-20081004184230-j2j1uottu2d0yl0m
Removed NullS. bu-bye.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
38
38
 
39
39
#define BITMAP_STACKBUF_SIZE (128/8)
40
40
 
41
 
KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NullS,0}, {NullS,0} };
 
41
KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NULL,0}, {NULL,0} };
42
42
 
43
43
/* number of entries in handlertons[] */
44
44
uint32_t total_ha= 0;
51
51
{
52
52
  { C_STRING_WITH_LEN("INNOBASE") },  { C_STRING_WITH_LEN("INNODB") },
53
53
  { C_STRING_WITH_LEN("HEAP") },      { C_STRING_WITH_LEN("MEMORY") },
54
 
  {NullS, 0}
 
54
  {NULL, 0}
55
55
};
56
56
 
57
57
const char *ha_row_type[] = {
60
60
 
61
61
const char *tx_isolation_names[] =
62
62
{ "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ", "SERIALIZABLE",
63
 
  NullS};
 
63
  NULL};
64
64
TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"",
65
65
                               tx_isolation_names, NULL};
66
66
 
2557
2557
  if (table->s->mysql_version == DRIZZLE_VERSION_ID)
2558
2558
    return(0);
2559
2559
 
2560
 
  strxmov(path, table->s->normalized_path.str, reg_ext, NullS);
 
2560
  strxmov(path, table->s->normalized_path.str, reg_ext, NULL);
2561
2561
 
2562
2562
  if ((file= my_open(path, O_RDWR|O_BINARY, MYF(MY_WME))) >= 0)
2563
2563
  {
3094
3094
  closefrm(&table, 0);
3095
3095
  if (error)
3096
3096
  {
3097
 
    strxmov(name_buff, db, ".", table_name, NullS);
 
3097
    strxmov(name_buff, db, ".", table_name, NULL);
3098
3098
    my_error(ER_CANT_CREATE_TABLE, MYF(ME_BELL+ME_WAITTANG), name_buff, error);
3099
3099
  }
3100
3100
err: