Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1-ndb

Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
a0609017 · joreland@mysql.com · 7a0af351 · 9d44e240 · a0609017 · a0609017
Commit a0609017 authored Aug 20, 2004 by joreland@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

include/my_time.h include/my_time.h +1 -0

sql/mysql_priv.h sql/mysql_priv.h +0 -1

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -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)

--- a/include/my_time.h
+++ b/include/my_time.h
@@ -27,6 +27,7 @@
 C_MODE_START
 extern ulonglong log_10_int[20];
+extern uchar days_in_month[];
 /*
  Portable time_t replacement.

--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -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;