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/sql_show.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/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e51633033ba..d5be2d455ab 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1076,13 +1076,7 @@ find_files(THD *thd, Dynamic_array<LEX_CSTRING*> *files, LEX_CSTRING *db, if (ha_discover_table_names(thd, db, dirp, &tl, false)) goto err; } -#if MYSQL_VERSION_ID < 100300 - /* incomplete optimization, but a less drastic change in GA version */ - if (!thd->lex->select_lex.order_list.elements && - !thd->lex->select_lex.group_list.elements) -#else if (is_show_command(thd)) -#endif tl.sort(); #ifndef DBUG_OFF else |