From 7ab7abdb51ab88664f12f1a7be3730aaa0a950db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org>
Date: Thu, 16 Jun 2016 18:52:46 +0300
Subject: [PATCH] Fix compilation failure when compiling with std=c90

Change variable declaration to be before any other statements.
---
 storage/maria/ma_sort.c | 5 ++---
 storage/myisam/sort.c   | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/storage/maria/ma_sort.c b/storage/maria/ma_sort.c
index 3180118a155..a95f9bb7ddb 100644
--- a/storage/maria/ma_sort.c
+++ b/storage/maria/ma_sort.c
@@ -335,15 +335,14 @@ err:
 
 static my_bool _ma_thr_find_all_keys_exec(MARIA_SORT_PARAM* sort_param)
 {
-  DBUG_ENTER("_ma_thr_find_all_keys");
-  DBUG_PRINT("enter", ("master: %d", sort_param->master));
-
   my_bool error= FALSE;
   ulonglong memavl, old_memavl;
   uint UNINIT_VAR(keys), idx;
   uint sort_length;
   uint maxbuffer;
   uchar **sort_keys= NULL;
+  DBUG_ENTER("_ma_thr_find_all_keys");
+  DBUG_PRINT("enter", ("master: %d", sort_param->master));
 
   if (sort_param->sort_info->got_error)
     DBUG_RETURN(TRUE);
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c
index e10e4e26112..b1cdbf450c8 100644
--- a/storage/myisam/sort.c
+++ b/storage/myisam/sort.c
@@ -321,16 +321,15 @@ static ha_rows find_all_keys(MI_SORT_PARAM *info, uint keys,
 
 static my_bool thr_find_all_keys_exec(MI_SORT_PARAM *sort_param)
 {
-  DBUG_ENTER("thr_find_all_keys");
-  DBUG_PRINT("enter", ("master: %d", sort_param->master));
-
   ulonglong memavl, old_memavl;
   uint UNINIT_VAR(keys), idx;
   uint sort_length;
   uint maxbuffer;
   uchar **sort_keys= NULL;
-
   my_bool error= FALSE;
+  DBUG_ENTER("thr_find_all_keys");
+  DBUG_PRINT("enter", ("master: %d", sort_param->master));
+
   if (sort_param->sort_info->got_error)
     DBUG_RETURN(error);