From cd48c1e23a0ca203d87786ae9b0f53aff4c1b433 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Thu, 26 Apr 2018 17:57:38 +0300
Subject: Removed some old #if MYSQL_VERSION

- Removed never used warning that explicit_defaults_for_timestamp was
  not set
---
 sql/sql_show.cc | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'sql/sql_show.cc')

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
-- 
cgit v1.2.1