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

into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
joreland@mysql.com 2004-08-20 21:56:15 +02:00
commit 9d44e240bd
3 changed files with 2 additions and 1 deletions

View file

@ -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)

View file

@ -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.

View file

@ -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;