← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Monty Taylor
  • Date: 2008-12-02 08:56:16 UTC
  • mfrom: (629.5.6 remove-strmake)
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: mordred@solanthus.local-20081202085616-k1dvv8fly0jt70ho
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
715
715
                                    &err_ptr, &error_len);
716
716
      if (error_len)
717
717
      {
718
 
        strmake(buff, err_ptr, min((uint32_t)sizeof(buff), error_len));
 
718
        strncpy(buff, err_ptr, min((uint32_t)sizeof(buff), error_len));
719
719
        fprintf(stderr, "Invalid mode to --compatible: %s\n", buff);
720
720
        exit(1);
721
721
      }
2975
2975
    Only one row is returned, and the first column is the name of the
2976
2976
    active log.
2977
2977
  */
2978
 
  strmake(buff_log_name, row[0], buff_len - 1);
 
2978
  strncpy(buff_log_name, row[0], buff_len - 1);
2979
2979
 
2980
2980
  drizzle_free_result(res);
2981
2981
  return 0;
3047
3047
 
3048
3048
      for (; pos != end && *pos != ','; pos++) ;
3049
3049
      var_len= (uint32_t) (pos - start);
3050
 
      strmake(buff, start, min((uint32_t)sizeof(buff), var_len));
 
3050
      strncpy(buff, start, min((uint32_t)sizeof(buff), var_len));
3051
3051
      find= find_type(buff, lib, var_len);
3052
3052
      if (!find)
3053
3053
      {
3148
3148
    return(result);                         /* assume table is ok */
3149
3149
  }
3150
3150
  if (!(row[1]))
3151
 
    strmake(table_type, "VIEW", NAME_LEN-1);
 
3151
    strncpy(table_type, "VIEW", NAME_LEN-1);
3152
3152
  else
3153
3153
  {
3154
3154
    /*
3157
3157
      these types, but we do want to use delayed inserts in the dump if
3158
3158
      the table type is _NOT_ one of these types
3159
3159
    */
3160
 
    strmake(table_type, row[1], NAME_LEN-1);
 
3160
    strncpy(table_type, row[1], NAME_LEN-1);
3161
3161
    if (opt_delayed)
3162
3162
    {
3163
3163
      if (strcmp(table_type,"MyISAM") &&