diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-23 20:49:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-23 20:49:31 +0200 |
| commit | c93405b7153df01362f9869bac7c2e305dd06af9 (patch) | |
| tree | 8043dec44994d714d28873d30d15e81ef3f040e7 /sql/mysqld.cc | |
| parent | be21a113da9748d06739b6522ea898257970b1c5 (diff) | |
| parent | 8637931f118b53ff6fdadf6006ccdb8dedd6f732 (diff) | |
| download | mariadb-git-10.0-merge.tar.gz | |
WIP Merge 5.5 into bb-10.0-vicentiu10.0-merge
Unresolved conflicts:
both modified: sql/item_cmpfunc.cc
both modified: sql/item_cmpfunc.h
both modified: sql/sql_partition.cc
both modified: storage/tokudb/CMakeLists.txt
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d9320fa3bcf..435fb07279f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3913,7 +3913,7 @@ static 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; } |