[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4395-gd18a3eb

[Marc Delisle]

The branch, master has been updated
       via  d18a3eb3c01cfc3c559985fe97869bfbb8f3511c (commit)
       via  cfcec687faaacc74a5318273450c1f14d98bb7e5 (commit)
      from  3f1170639eaa53653a1d28f8bce15252fe6f6ea4 (commit)


- Log -----------------------------------------------------------------
commit d18a3eb3c01cfc3c559985fe97869bfbb8f3511c
Merge: 3f1170639eaa53653a1d28f8bce15252fe6f6ea4 cfcec687faaacc74a5318273450c1f14d98bb7e5
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun May 30 08:44:33 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    1 +
 libraries/sqlparser.lib.php |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d1ad534..832f8ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,6 +90,7 @@ $Id$
 + [lang] Greek update, thanks to Panagiotis Papazoglou - panos78
 + [lang] Updated lot of translation based on work done in master branch.
 - bug #3008411 [databases] Last dropped database remains active in navi
+- bug #2986383 [parser] Not all data being shown / counted
 
 3.3.3.0 (2010-05-10)
 - patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 349d010..136612f 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -2220,6 +2220,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                         $after      = '';
                         $before     = '';
                     }
+                    // for example SELECT 1 somealias
+                    if ($typearr[1] == 'digit_integer') {
+                        $before     = ' ';
+                    }
                     if (($typearr[3] == 'alpha_columnType') || ($typearr[3] == 'alpha_identifier')) {
                         $after      .= ' ';
                     }


hooks/post-receive
-- 
phpMyAdmin