← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to extra/replace.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/replace.c
136
136
    }
137
137
  }
138
138
  free_buffer();
 
139
  my_free(replace, MYF(0));
139
140
  my_end(verbose ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
140
141
  exit(error ? 2 : 0);
141
142
  return 0;                                     /* No compiler warning */
311
312
  pa->flag[pa->typelib.count]=0;                        /* Reset flag */
312
313
  pa->typelib.type_names[pa->typelib.count++]= (char*) (pa->str+pa->length);
313
314
  pa->typelib.type_names[pa->typelib.count]= NullS;     /* Put end-mark */
314
 
  VOID(strmov((char*) pa->str + pa->length, name));
 
315
  (void) strmov((char*) pa->str + pa->length, name);
315
316
  pa->length+=length;
316
317
  DBUG_RETURN(0);
317
318
} /* insert_pointer_name */
433
434
    free_sets(&sets);
434
435
    DBUG_RETURN(0);
435
436
  }
436
 
  VOID(make_new_set(&sets));                    /* Set starting set */
 
437
  (void) make_new_set(&sets);                   /* Set starting set */
437
438
  make_sets_invisible(&sets);                   /* Hide previus sets */
438
439
  used_sets=-1;
439
440
  word_states=make_new_set(&sets);              /* Start of new word */