diff options
| author | joreland@mysql.com <> | 2004-08-20 21:56:15 +0200 |
|---|---|---|
| committer | joreland@mysql.com <> | 2004-08-20 21:56:15 +0200 |
| commit | 9d44e240bdf6aa3e66263a888cde7ae38ceb901b (patch) | |
| tree | ffb06f82a60812719dfa5e87ae466c4aa218cb55 | |
| parent | 3145031ae1f007cca34b7f9cc2993a14c6d81299 (diff) | |
| parent | 69ec5574948cc88f52eb61813699c9a9543bb587 (diff) | |
| download | mariadb-git-9d44e240bdf6aa3e66263a888cde7ae38ceb901b.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | include/my_time.h | 1 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index b48e861f6df..76a72fc9b4a 100644 --- 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) diff --git a/include/my_time.h b/include/my_time.h index 1c549ced6b0..6c53e39d1d8 100644 --- 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. diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 031f021e261..c4867481ca9 100644 --- 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; |