← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
22
22
/* INFORMATION_SCHEMA name */
23
23
LEX_STRING INFORMATION_SCHEMA_NAME= {C_STRING_WITH_LEN("information_schema")};
24
24
 
25
 
/* MYSQL_SCHEMA name */
26
 
LEX_STRING MYSQL_SCHEMA_NAME= {C_STRING_WITH_LEN("mysql")};
 
25
/* DRIZZLE_SCHEMA name */
 
26
LEX_STRING DRIZZLE_SCHEMA_NAME= {C_STRING_WITH_LEN("mysql")};
27
27
 
28
28
/* Functions defined in this file */
29
29
 
194
194
    /*
195
195
      This constant is used to mark that no table map version has been
196
196
      assigned.  No arithmetic is done on the value: it will be
197
 
      overwritten with a value taken from MYSQL_BIN_LOG.
 
197
      overwritten with a value taken from DRIZZLE_BIN_LOG.
198
198
    */
199
199
    share->table_map_version= ~(uint64_t)0;
200
200
 
739
739
      next_chunk+= 2 + share->comment.length;
740
740
    }
741
741
    assert(next_chunk <= buff_end);
742
 
    if (share->mysql_version >= MYSQL_VERSION_TABLESPACE_IN_FRM_CGE)
 
742
    if (share->mysql_version >= DRIZZLE_VERSION_TABLESPACE_IN_FRM_CGE)
743
743
    {
744
744
      /*
745
745
       New frm format in mysql_version 5.2.5 (originally in
750
750
      */
751
751
      if (next_chunk >= buff_end)
752
752
      {
753
 
        if (share->mysql_version >= MYSQL_VERSION_TABLESPACE_IN_FRM)
 
753
        if (share->mysql_version >= DRIZZLE_VERSION_TABLESPACE_IN_FRM)
754
754
        {
755
755
          goto err;
756
756
        }
2101
2101
    fileinfo[45]= 0;
2102
2102
    fileinfo[46]= 0;
2103
2103
    int4store(fileinfo+47, key_length);
2104
 
    tmp= MYSQL_VERSION_ID;          // Store to avoid warning from int4store
 
2104
    tmp= DRIZZLE_VERSION_ID;          // Store to avoid warning from int4store
2105
2105
    int4store(fileinfo+51, tmp);
2106
2106
    int4store(fileinfo+55, create_info->extra_size);
2107
2107
    /*
2368
2368
  {
2369
2369
 
2370
2370
    /* previous MySQL version */
2371
 
    if (MYSQL_VERSION_ID > table->s->mysql_version)
 
2371
    if (DRIZZLE_VERSION_ID > table->s->mysql_version)
2372
2372
    {
2373
2373
      sql_print_error(ER(ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE),
2374
2374
                      table->alias, table_f_count, table->s->fields,
2375
 
                      table->s->mysql_version, MYSQL_VERSION_ID);
 
2375
                      table->s->mysql_version, DRIZZLE_VERSION_ID);
2376
2376
      return(true);
2377
2377
    }
2378
 
    else if (MYSQL_VERSION_ID == table->s->mysql_version)
 
2378
    else if (DRIZZLE_VERSION_ID == table->s->mysql_version)
2379
2379
    {
2380
2380
      sql_print_error(ER(ER_COL_COUNT_DOESNT_MATCH_CORRUPTED), table->alias,
2381
2381
                      table_f_count, table->s->fields);