← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Mark Atwood
  • Date: 2011-11-11 18:23:18 UTC
  • mfrom: (2456.1.5 rf)
  • Revision ID: me@mark.atwood.name-20111111182318-skgcp9ce65fd2goa
merge lp:~olafvdspek/drizzle/refactor11

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
318
318
    vector<string>::iterator it= drop_columns.begin();
319
319
    while (it != drop_columns.end())
320
320
    {
321
 
      if (not my_strcasecmp(system_charset_info, field->field_name, it->c_str()))
 
321
      if (not system_charset_info->strcasecmp(field->field_name, it->c_str()))
322
322
      {
323
323
        /* Reset auto_increment value if it was dropped */
324
324
        if (MTYP_TYPENR(field->unireg_check) == Field::NEXT_NUMBER &&
347
347
    while ((def= def_it++))
348
348
    {
349
349
      if (def->change &&
350
 
          ! my_strcasecmp(system_charset_info, field->field_name, def->change))
 
350
          ! system_charset_info->strcasecmp(field->field_name, def->change))
351
351
              break;
352
352
    }
353
353
 
373
373
 
374
374
      for (; alter != alter_info->alter_list.end(); alter++)
375
375
      {
376
 
        if (not my_strcasecmp(system_charset_info,field->field_name, alter->name))
 
376
        if (not system_charset_info->strcasecmp(field->field_name, alter->name))
377
377
          break;
378
378
      }
379
379
 
417
417
 
418
418
      while ((find= find_it++)) /* Add new columns */
419
419
      {
420
 
        if (not my_strcasecmp(system_charset_info,def->after, find->field_name))
 
420
        if (not system_charset_info->strcasecmp(def->after, find->field_name))
421
421
          break;
422
422
      }
423
423
 
471
471
    vector<string>::iterator it= drop_keys.begin();
472
472
    while (it != drop_keys.end())
473
473
    {
474
 
      if (not my_strcasecmp(system_charset_info, key_name, it->c_str()))
 
474
      if (not system_charset_info->strcasecmp(key_name, it->c_str()))
475
475
        break;
476
476
      it++;
477
477
    }
496
496
      {
497
497
        if (cfield->change)
498
498
        {
499
 
          if (not my_strcasecmp(system_charset_info, key_part_name, cfield->change))
 
499
          if (not system_charset_info->strcasecmp(key_part_name, cfield->change))
500
500
            break;
501
501
        }
502
 
        else if (not my_strcasecmp(system_charset_info, key_part_name, cfield->field_name))
 
502
        else if (not system_charset_info->strcasecmp(key_part_name, cfield->field_name))
503
503
          break;
504
504
      }
505
505
 
555
555
    vector<string>::iterator it= drop_fkeys.begin();
556
556
    while (it != drop_fkeys.end())
557
557
    {
558
 
      if (! my_strcasecmp(system_charset_info, original_proto.fk_constraint(j).name().c_str(), it->c_str()))
 
558
      if (! system_charset_info->strcasecmp(original_proto.fk_constraint(j).name().c_str(), it->c_str()))
559
559
      {
560
560
        break;
561
561
      }
1231
1231
 
1232
1232
      snprintf(old_name, sizeof(old_name), "%s2-%lx-%"PRIx64, TMP_FILE_PREFIX, (unsigned long) current_pid, session->thread_id);
1233
1233
 
1234
 
      my_casedn_str(files_charset_info, old_name);
 
1234
      files_charset_info->casedn_str(old_name);
1235
1235
 
1236
1236
      wait_while_table_is_used(session, table, HA_EXTRA_PREPARE_FOR_RENAME);
1237
1237
      session->close_data_files_and_morph_locks(original_table_identifier);