Skip to content

bug fix 4249 #913

Merged
merged 1 commit into from Feb 11, 2014

3 participants

@sampathLiyanage

Signed-off-by: Sampath Liyanage plbsam@gmail.com

@sampathLiyanage sampathLiyanage bug fix 4249
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
b6cd8cd
@sampathLiyanage sampathLiyanage commented on the diff Feb 9, 2014
libraries/sql.lib.php
@@ -875,6 +875,7 @@ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end)
&& (empty($analyzed_sql_results['analyzed_sql'][0]['where_clause'])
|| $analyzed_sql_results['analyzed_sql'][0]['where_clause'] == '1 ')
&& ! isset($find_real_end)
+ && !$analyzed_sql_results['is_subquery']

PMA_isJustBrowsing() function wasn't checking if a query was a subquery. If query is a subquery then it couldn't be "just Browsing" and the function should return false. Before changing this, when a query like "SELECT COUNT(*) FROM (SELECT 1) AS TB" runs, it made the "$justBrowsing" input parameter of the function PMA_countQueryResults() true and PMA detected it as "just browsing". That's why this line was added.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@sampathLiyanage sampathLiyanage commented on the diff Feb 9, 2014
libraries/sql.lib.php
@@ -1392,7 +1393,7 @@ function PMA_countQueryResults(
// "Showing rows..." message
// $_SESSION['tmpval']['max_rows'] = 'all';
$unlim_num_rows = $num_rows;
- } elseif ($is_select) {
+ } elseif ($is_select || $analyzed_sql_results['is_subquery']) {

Even thought "SELECT COUNT(*) FROM (SELECT 1) AS TB" is a select query, the function PMA_SQP_analyze($arr) wasn't making the $is_select attribute is true for this query. To fix that, this line was added.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@sampathLiyanage sampathLiyanage referenced this pull request Feb 9, 2014
Closed

bug fix 4249 #905

@coveralls

Coverage Status

Coverage decreased (-0.01%) when pulling b6cd8cd on sampathLiyanage:bugfix4249 into d32e6af on phpmyadmin:QA_4_1.

@lem9 lem9 self-assigned this Feb 11, 2014
@lem9
lem9 commented Feb 11, 2014

Thanks.

@lem9 lem9 merged commit b7da0fa into phpmyadmin:QA_4_1 Feb 11, 2014

1 check passed

Details default The Travis CI build passed
@nijel nijel added a commit that referenced this pull request May 10, 2014
@nijel nijel Upgrade tcpdf to 6.0.077
6.0.077 (2014-05-06)
	- A Datamatrix barcode bug was fixed.

6.0.076 (2014-05-06)
	- A bug in Datamatrix Base256 encoding was fixed.
	- Merged fix for SVG use/clip-gradient.
	- Now it is possible to prefix a page number in Link methods with the * character to avoid been changed when adding/deleting/moving pages (see example_045.php).

6.0.075 (2014-05-05)
	- Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.

6.0.074 (2014-05-03)
	- Part of Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.
	- Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.

6.0.073 (2014-04-29)
	- Bug #913 "Possible bug with line-height" was fixed.
	- Bug #914 "MultiCell and FitCell" was fixed.
	- Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.

6.0.072 (2014-04-27)
	- Deprecated curly braces substring syntax was replaced with square braces.

6.0.071 (2014-04-25)
	- Bug #911 "error with buffered png pics" was fixed.

6.0.070 (2014-04-24)
	- Bug #910 "An SVG image is being cut off (with clipping mask) when you use align options" was fixed.

6.0.069 (2014-04-24)
	- Datamatrix Base256 encoding was fixed.

6.0.068 (2014-04-22)
	- Some Datamatrix barcode bugs were fixed.

6.0.067 (2014-04-21)
	- startLayer() method signature was changed to include a new "lock" parameter.

6.0.066 (2014-04-20)
	- Bug #908 "Linebreak is not considered when getting length of the next string" was fixed.

6.0.065 (2014-04-10)
	- Bug #905 "RGB percentage color bug in convertHTMLColorToDec()" was fixed.

6.0.064 (2014-04-07)
	- Header and Footer fonts are now set by default.
	- Bug #904 "PDF corrupted" was fixed.

6.0.063 (2014-04-03)
	- Method TCPDF_IMAGES::_parsepng() was fixed to support transparency in Indexed images.

Signed-off-by: Michal Čihař <michal@cihar.com>
bfafee8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.