← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

Merged from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
150
150
  pos= table_arg->key_info;
151
151
  for (i= 0; i < share->keys; i++, pos++)
152
152
  {
153
 
    keydef[i].flag= ((uint16_t) pos->flags & (HA_NOSAME | HA_FULLTEXT ));
154
 
    keydef[i].key_alg= pos->algorithm == HA_KEY_ALG_UNDEF ?  (HA_KEY_ALG_BTREE) : pos->algorithm;
 
153
    keydef[i].flag= ((uint16_t) pos->flags & (HA_NOSAME));
 
154
    keydef[i].key_alg= HA_KEY_ALG_BTREE;
155
155
    keydef[i].block_length= pos->block_size;
156
156
    keydef[i].seg= keyseg;
157
157
    keydef[i].keysegs= pos->key_parts;
332
332
  {
333
333
    HA_KEYSEG *t1_keysegs= t1_keyinfo[i].seg;
334
334
    HA_KEYSEG *t2_keysegs= t2_keyinfo[i].seg;
335
 
    if (t1_keyinfo[i].flag & HA_FULLTEXT && t2_keyinfo[i].flag & HA_FULLTEXT)
336
 
      continue;
337
 
    else if (t1_keyinfo[i].flag & HA_FULLTEXT ||
338
 
             t2_keyinfo[i].flag & HA_FULLTEXT)
339
 
    {
340
 
       return(1);
341
 
    }
342
 
    if (t1_keyinfo[i].flag & HA_SPATIAL && t2_keyinfo[i].flag & HA_SPATIAL)
343
 
      continue;
344
 
    else if (t1_keyinfo[i].flag & HA_SPATIAL ||
345
 
             t2_keyinfo[i].flag & HA_SPATIAL)
346
 
    {
347
 
       return(1);
348
 
    }
349
335
    if (t1_keyinfo[i].keysegs != t2_keyinfo[i].keysegs ||
350
336
        t1_keyinfo[i].key_alg != t2_keyinfo[i].key_alg)
351
337
    {
1631
1617
                      HA_CREATE_INFO *ha_create_info)
1632
1618
{
1633
1619
  int error;
1634
 
  uint create_flags= 0, records, i;
 
1620
  uint create_flags= 0, records;
1635
1621
  char buff[FN_REFLEN];
1636
1622
  MI_KEYDEF *keydef;
1637
1623
  MI_COLUMNDEF *recinfo;
1638
1624
  MI_CREATE_INFO create_info;
1639
1625
  TABLE_SHARE *share= table_arg->s;
1640
1626
  uint options= share->db_options_in_use;
1641
 
  for (i= 0; i < share->keys; i++)
1642
 
  {
1643
 
    if (table_arg->key_info[i].flags & HA_USES_PARSER)
1644
 
    {
1645
 
      create_flags|= HA_CREATE_RELIES_ON_SQL_LAYER;
1646
 
      break;
1647
 
    }
1648
 
  }
1649
1627
  if ((error= table2myisam(table_arg, &keydef, &recinfo, &records)))
1650
1628
    return(error); /* purecov: inspected */
1651
1629
  memset((char*) &create_info, 0, sizeof(create_info));