← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

Monty fixes pluss a few from me for charset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1048
1048
          sql_field -- at the end of execution.
1049
1049
        */
1050
1050
        interval= sql_field->interval= typelib(session->mem_root,
1051
 
                                               sql_field->interval_list);
 
1051
                                               *sql_field->interval_list);
1052
1052
        String conv;
1053
1053
        char comma_buf[4];
1054
1054
        int comma_length= cs->cset->wc_mb(cs, ',', (unsigned char*) comma_buf,
1056
1056
                                          sizeof(comma_buf));
1057
1057
        assert(comma_length > 0);
1058
1058
 
1059
 
        vector<String*>::iterator int_it= sql_field->interval_list.begin();
1060
 
        for (uint32_t i= 0; int_it != sql_field->interval_list.end(); ++int_it, ++i)
 
1059
        vector<String*>::iterator int_it= sql_field->interval_list->begin();
 
1060
        for (uint32_t i= 0; int_it != sql_field->interval_list->end(); ++int_it, ++i)
1061
1061
        {
1062
1062
          String *tmp= *int_it;
1063
1063
          if (String::needs_conversion(tmp->length(), tmp->charset(),
1076
1076
          interval->type_lengths[i]= lengthsp;
1077
1077
          ((unsigned char *)interval->type_names[i])[lengthsp]= '\0';
1078
1078
        }
1079
 
        sql_field->interval_list.empty(); // Don't need interval_list anymore
 
1079
        sql_field->interval_list->empty(); // Don't need interval_list anymore
1080
1080
      }
1081
1081
 
1082
1082
      /* DRIZZLE_TYPE_ENUM */