diff options
| author | Marc Delisle <marc@infomarc.info> | 2011-12-28 17:44:04 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2011-12-28 17:44:04 +0400 |
| commit | 554a55134d7b5655f63277554f0c5a9f0a3a1e03 (patch) | |
| tree | 4bd7351454786cd1bc78925bf1ddef37eff485a8 /sql.php | |
| parent | d52db4be6a5915f07b7e633dbb2ee48546f1c61f (diff) | |
| parent | f7a9d2a36a5cedd0b380e8ca89de856a44da1874 (diff) | |
Fix merge conflicts
Diffstat (limited to 'sql.php')
| -rw-r--r-- | sql.php | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -592,6 +592,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { if (! $is_group && ! isset($analyzed_sql[0]['queryflags']['union']) + && ! isset($analyzed_sql[0]['queryflags']['distinct']) && ! isset($analyzed_sql[0]['table_ref'][1]['table_name']) && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ') && ! isset($find_real_end) |