← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to sql/init.cc

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/init.cc
35
35
  wild_many='%'; wild_one='_'; wild_prefix='\\'; /* Change to sql syntax */
36
36
 
37
37
  current_pid=(ulong) getpid();         /* Save for later ref */
38
 
  init_time();                          /* Init time-functions (read zone) */
 
38
  my_init_time();                       /* Init time-functions (read zone) */
39
39
#ifndef EMBEDDED_LIBRARY
40
40
  my_abort_hook=unireg_abort;           /* Abort with close of databases */
41
41
#endif
42
42
 
43
 
  VOID(strmov(reg_ext,".frm"));
 
43
  (void) strmov(reg_ext,".frm");
44
44
  reg_ext_length= 4;
45
45
  specialflag=SPECIAL_SAME_DB_NAME | options;  /* Set options from argv */
46
46
  DBUG_VOID_RETURN;