From 6b3f10523e1b00a072fd2a6ad24aeb86dc534bca Mon Sep 17 00:00:00 2001
From: Thilanka Kaushalya <lgtkaushalya@gmail.com>
Date: Fri, 12 Aug 2011 22:47:23 +0530
Subject: [PATCH] Added table results for actions in Table maintenance in Table
 options

---
 js/functions.js | 27 ++++++++++++++++++---------
 sql.php         | 27 ++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 9fba964cac..d1818bd5a7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2069,20 +2069,29 @@ $(document).ready(function() {
         var $link = $(this);
         var href = $link.find("a").first().attr("href");
         href = href.split('?');
+        if ($("#sqlqueryresults").length != 0) {
+            $("#sqlqueryresults").remove();
+        }
+        if ($("#result_query").length != 0) {
+            $("#result_query").remove();
+        }
         //variables which stores the common attributes
         $.post(href[0], href[1]+"&ajax_request=true", function(data) {
-            if ($("#sqlqueryresults").length != 0) {
-                $("#sqlqueryresults").remove();
-            }
-            if ($("#result_query").length != 0) {
-                $("#result_query").remove();
-            }
-            if (data.success == true) {
+            if (data.success == undefined) {
+                var $temp_div = $("<div id='temp_div'></div>");
+                $temp_div.html(data);
+                var $success = $temp_div.find("#result_query .success");
+                PMA_ajaxShowMessage($success);
+                $("<div id='sqlqueryresults' class='ajax'></div>").insertAfter("#topmenucontainer");
+                $("#sqlqueryresults").html(data);
+                PMA_init_slider();
+                $("#sqlqueryresults").children("fieldset").remove();
+            } else if (data.success == true ) {
                 PMA_ajaxShowMessage(data.message);
-                $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
+                $("<div id='sqlqueryresults' class='ajax'></div>").insertAfter("#topmenucontainer");
                 $("#sqlqueryresults").html(data.sql_query);
             } else {
-                var $temp_div = $("<div id='temp_div'></div>")
+                var $temp_div = $("<div id='temp_div'></div>");
                 $temp_div.html(data.error);
                 var $error = $temp_div.find("code").addClass("error");
                 PMA_ajaxShowMessage($error);
diff --git a/sql.php b/sql.php
index d629860c18..d46d0645cb 100644
--- a/sql.php
+++ b/sql.php
@@ -867,10 +867,31 @@ else {
     }
 
     if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) {
-        echo $show_query;
+        $GLOBALS['js_include'][] = 'functions.js';
+        $GLOBALS['js_include'][] = 'makegrid.js';
+        $GLOBALS['js_include'][] = 'sql.js';
+        
+        // Gets the list of fields properties
+        if (isset($result) && $result) {
+            $fields_meta = PMA_DBI_get_fields_meta($result);
+            $fields_cnt  = count($fields_meta);
+        }
+
+        if (empty($disp_mode)) {
+            // see the "PMA_setDisplayMode()" function in
+            // libraries/display_tbl.lib.php
+            $disp_mode = 'urdr111101';
+        }
+
+        // hide edit and delete links for information_schema
+        if ($db == 'information_schema') {
+            $disp_mode = 'nnnn110111';
+        }
+        
         $message = PMA_Message::success($message);
-        $extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
-        PMA_ajaxResponse($message,$message->isSuccess(),$extra_data);
+        echo PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
+        PMA_displayTable($result, $disp_mode, $analyzed_sql);
+        exit();
     }
 
     // Displays the headers