mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 02:47:37 +02:00
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294 client/mysqlbinlog.cc: Auto merged include/my_time.h: Auto merged sql-common/my_time.c: Auto merged sql/init.cc: Auto merged sql/tztime.cc: Auto merged
This commit is contained in:
commit
add10a4849
5 changed files with 8 additions and 8 deletions
|
|
@ -35,7 +35,7 @@ void unireg_init(ulong options)
|
|||
wild_many='%'; wild_one='_'; wild_prefix='\\'; /* Change to sql syntax */
|
||||
|
||||
current_pid=(ulong) getpid(); /* Save for later ref */
|
||||
init_time(); /* Init time-functions (read zone) */
|
||||
my_init_time(); /* Init time-functions (read zone) */
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
my_abort_hook=unireg_abort; /* Abort with close of databases */
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue