diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-04 17:10:22 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-04 17:10:22 +0300 |
| commit | ac738d8265b665dc90be0a7977468096ee463c78 (patch) | |
| tree | e36c07742e17423e4748490721378b3ed78f54cf /sql/mysqld.cc | |
| parent | 517f586762a5c775f46668fedfa10c3c802e7f18 (diff) | |
| parent | 121e04732ea3b5edf36335f827cc5bcb08fb7665 (diff) | |
| download | mariadb-git-ac738d8265b665dc90be0a7977468096ee463c78.tar.gz | |
merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3ffc1a21e9c..7598c2a5276 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3233,6 +3233,13 @@ static int init_common_variables(const char *conf_file_name, int argc, 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) |