~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-01 11:00:41 UTC
  • mto: (632.1.17 devel)
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: dev@torum.net-20081201110041-gia57w4pw4qwh13t
Third pass of replacing MySQL's strmake() with libc calls

Show diffs side-by-side

added added

removed removed

Lines of Context:
1199
1199
                                            &not_used));
1200
1200
    if (error_len)
1201
1201
    {
1202
 
      strmake(buff, error, cmin(sizeof(buff) - 1, (uint64_t)error_len));
 
1202
      size_t len = cmin(sizeof(buff) - 1, error_len);
 
1203
      strncpy(buff, error, len);
 
1204
      buff[len]= '\0';
1203
1205
      goto err;
1204
1206
    }
1205
1207
  }