From abc0e78ad5bbdd15b8914df1f3764d740f0f5076 Mon Sep 17 00:00:00 2001 From: tsia Date: Tue, 23 Jan 2018 11:54:45 +0100 Subject: [PATCH 1/2] Update sql_parse.cc --- sql/sql_parse.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 00efd393f6d..38341540a38 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1250,7 +1250,7 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data, TODO: remove this when we have full 64 bit my_time_t support */ - sql_print_error("This MySQL server doesn't support dates later then 2038"); + sql_print_error("This MySQL server doesn't support dates later than 2038"); ulong master_access= thd->security_context()->master_access(); thd->security_context()->set_master_access(master_access | SHUTDOWN_ACL); command= COM_SHUTDOWN; From 2c64aa350e2f972029650cccce7386f2e98530d0 Mon Sep 17 00:00:00 2001 From: tsia Date: Tue, 23 Jan 2018 11:55:16 +0100 Subject: [PATCH 2/2] Update mysqld.cc --- sql/mysqld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c70468b61be..2ca78d6067b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2735,7 +2735,7 @@ int init_common_variables() /* TODO: remove this when my_time_t is 64 bit compatible */ if (!IS_TIME_T_VALID_FOR_TIMESTAMP(server_start_time)) { - sql_print_error("This MySQL server doesn't support dates later then 2038"); + sql_print_error("This MySQL server doesn't support dates later than 2038"); return 1; }