diff options
| author | Monty <monty@mariadb.org> | 2018-04-26 17:57:38 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-04-26 17:57:38 +0300 |
| commit | cd48c1e23a0ca203d87786ae9b0f53aff4c1b433 (patch) | |
| tree | 8ce0e408b91e1ff7d08f81d401f6b2230fe08dcc /sql/mysqld.cc | |
| parent | 2ccd6716fc730b3ff5e1bc2f8dc08ac561db3cb4 (diff) | |
| download | mariadb-git-cd48c1e23a0ca203d87786ae9b0f53aff4c1b433.tar.gz | |
Removed some old #if MYSQL_VERSION
- Removed never used warning that explicit_defaults_for_timestamp was
not set
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 851082a98e4..2b1b09c7e59 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9680,17 +9680,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr) global_system_variables.max_allowed_packet); } -#if MYSQL_VERSION_ID > 101001 - /* - TIMESTAMP columns get implicit DEFAULT values when - --explicit_defaults_for_timestamp is not set. - */ - if (!opt_help && !opt_explicit_defaults_for_timestamp) - sql_print_warning("TIMESTAMP with implicit DEFAULT value is deprecated. " - "Please use --explicit_defaults_for_timestamp server " - "option (see documentation for more details)."); -#endif - if (log_error_file_ptr != disabled_my_option) opt_error_log= 1; else |