Skip to content

M
MariaDB
Commit 9d44e240 authored by joreland@mysql.com's avatar joreland@mysql.com
Browse files
Options

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents 3145031a 69ec5574
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
BitKeeper/etc/logging_ok
View file @ 9d44e240
...@@ -154,6 +154,7 @@ ram@gw.udmsearch.izhnet.ru ...@@ -154,6 +154,7 @@ ram@gw.udmsearch.izhnet.ru
ram@mysql.r18.ru ram@mysql.r18.ru
ram@ram.(none) ram@ram.(none)
ranger@regul.home.lan ranger@regul.home.lan
rburnett@build.mysql.com
root@home.(none) root@home.(none)
root@x3.internalnet root@x3.internalnet
salle@banica.(none) salle@banica.(none)
......
include/my_time.h
View file @ 9d44e240
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
C_MODE_START C_MODE_START
extern ulonglong log_10_int[20]; extern ulonglong log_10_int[20];
extern uchar days_in_month[];
/* /*
Portable time_t replacement. Portable time_t replacement.
......
sql/mysql_priv.h
View file @ 9d44e240
...@@ -828,7 +828,6 @@ extern Gt_creator gt_creator; ...@@ -828,7 +828,6 @@ extern Gt_creator gt_creator;
extern Lt_creator lt_creator; extern Lt_creator lt_creator;
extern Ge_creator ge_creator; extern Ge_creator ge_creator;
extern Le_creator le_creator; extern Le_creator le_creator;
extern uchar days_in_month[];
extern char language[LIBLEN],reg_ext[FN_EXTLEN]; extern char language[LIBLEN],reg_ext[FN_EXTLEN];
extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN]; extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN];
extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file; extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7