394ad895ec
64-bit archs and apply a patch from upstream to properly fix the regression. from Brad (maintainer)
41 lines
1.4 KiB
Plaintext
41 lines
1.4 KiB
Plaintext
$OpenBSD: patch-sql_mysqld_cc,v 1.24 2011/01/11 11:03:03 ajacoutot Exp $
|
|
--- sql/mysqld.cc.orig Mon Nov 29 05:38:01 2010
|
|
+++ sql/mysqld.cc Fri Jan 7 19:25:15 2011
|
|
@@ -3234,13 +3234,6 @@ static int init_common_variables(const char *conf_file
|
|
|
|
max_system_variables.pseudo_thread_id= (ulong)~0;
|
|
server_start_time= flush_status_time= my_time(0);
|
|
- /* TODO: remove this when my_time_t is 64 bit compatible */
|
|
- if (server_start_time >= (time_t) MY_TIME_T_MAX)
|
|
- {
|
|
- sql_print_error("This MySQL server doesn't support dates later then 2038");
|
|
- return 1;
|
|
- }
|
|
-
|
|
rpl_filter= new Rpl_filter;
|
|
binlog_filter= new Rpl_filter;
|
|
if (!rpl_filter || !binlog_filter)
|
|
@@ -3278,6 +3271,13 @@ static int init_common_variables(const char *conf_file
|
|
*/
|
|
mysql_bin_log.init_pthread_objects();
|
|
|
|
+ /* TODO: remove this when my_time_t is 64 bit compatible */
|
|
+ if (!IS_VALID_TIME_T(server_start_time))
|
|
+ {
|
|
+ sql_print_error("This MySQL server doesn't support dates later then 2038");
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
if (gethostname(glob_hostname,sizeof(glob_hostname)) < 0)
|
|
{
|
|
strmake(glob_hostname, STRING_WITH_LEN("localhost"));
|
|
@@ -4412,7 +4412,7 @@ int main(int argc, char **argv)
|
|
select_thread_in_use=1;
|
|
|
|
#ifdef HAVE_LIBWRAP
|
|
- libwrapName= my_progname+dirname_length(my_progname);
|
|
+ libwrapName= (char *) my_progname+dirname_length(my_progname);
|
|
openlog(libwrapName, LOG_PID, LOG_AUTH);
|
|
#endif
|
|
|