← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_sum.cc

Merged from Felipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_sum.cc
3143
3143
  /* Adjust warning message to include total number of cut values */
3144
3144
  if (warning)
3145
3145
  {
3146
 
    char warn_buff[MYSQL_ERRMSG_SIZE];
 
3146
    char warn_buff[DRIZZLE_ERRMSG_SIZE];
3147
3147
    sprintf(warn_buff, ER(ER_CUT_VALUE_GROUP_CONCAT), count_cut_values);
3148
3148
    warning->set_msg(current_thd, warn_buff);
3149
3149
    warning= 0;
3174
3174
      }
3175
3175
      if (warning)
3176
3176
      {
3177
 
        char warn_buff[MYSQL_ERRMSG_SIZE];
 
3177
        char warn_buff[DRIZZLE_ERRMSG_SIZE];
3178
3178
        sprintf(warn_buff, ER(ER_CUT_VALUE_GROUP_CONCAT), count_cut_values);
3179
3179
        warning->set_msg(thd, warn_buff);
3180
3180
        warning= 0;
3453
3453
      Item_func_group_concat::cleanup().
3454
3454
    */
3455
3455
    assert(table);
3456
 
    warning= push_warning(table->in_use, MYSQL_ERROR::WARN_LEVEL_WARN,
 
3456
    warning= push_warning(table->in_use, DRIZZLE_ERROR::WARN_LEVEL_WARN,
3457
3457
                          ER_CUT_VALUE_GROUP_CONCAT,
3458
3458
                          ER(ER_CUT_VALUE_GROUP_CONCAT));
3459
3459
  }