Commit e73e4bea authored Aug 20, 2004 by unknown

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

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


sql/mysql_priv.h:
  Auto merged

parents 8f68a9eb 185fc2da

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ ram@gw.udmsearch.izhnet.ru
		ram@mysql.r18.ru
		ram@ram.(none)
		ranger@regul.home.lan
		rburnett@build.mysql.com
		root@home.(none)
		root@x3.internalnet
		salle@banica.(none)

include/my_time.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		C_MODE_START

		extern ulonglong log_10_int[20];
		extern uchar days_in_month[];

		/*
		Portable time_t replacement.

sql/mysql_priv.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -828,7 +828,6 @@ extern Gt_creator gt_creator;
		extern Lt_creator lt_creator;
		extern Ge_creator ge_creator;
		extern Le_creator le_creator;
		extern uchar days_in_month[];
		extern char language[LIBLEN],reg_ext[FN_EXTLEN];
		extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN];
		extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file;