database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

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

Browse Source 
into build.mysql.com:/users/rburnett/mysql-4.1


sql/mysql_priv.h:
  Auto merged
This commit is contained in:
unknown
2004-08-20 21:48:16 +02:00
parent 8f68a9eb6f 185fc2da94
commit e73e4bea1b
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
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)

1
include/my_time.h
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.

1
sql/mysql_priv.h
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;