← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/handler0alter.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.1.6)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20120619104649-e2l0ggd4oz3um0f4
Tags: upstream-7.1.36-stable
Import upstream version 7.1.36-stable

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/handler0alter.cc
23
23
 
24
24
#include <config.h>
25
25
#include <drizzled/error.h>
26
 
#include <drizzled/charset_info.h>
 
26
#include <drizzled/charset.h>
27
27
#include <drizzled/field.h>
28
28
#include <drizzled/table.h>
29
29
#include <drizzled/field/varstring.h>
516
516
        /* If there is a primary key, it is always the first index
517
517
        defined for the table. */
518
518
 
519
 
        new_primary = !my_strcasecmp(system_charset_info,
520
 
                                     key_info->name, "PRIMARY");
 
519
        new_primary = !system_charset_info->strcasecmp(key_info->name, "PRIMARY");
521
520
 
522
521
        /* If there is a UNIQUE INDEX consisting entirely of NOT NULL
523
522
        columns and if the index does not contain column prefix(es)
556
555
                UNIQUE INDEX, it must be converted to a secondary index. */
557
556
 
558
557
                if (dict_index_get_nth_col(index, 0)->mtype == DATA_SYS
559
 
                    || !my_strcasecmp(system_charset_info,
560
 
                                      index->name, "PRIMARY")) {
 
558
                    || !system_charset_info->strcasecmp(index->name, "PRIMARY")) 
 
559
    {
561
560
                        index = dict_table_get_next_index(index);
562
561
                }
563
562