From f434f7cadab6059b4e0a3e81cca47d783bcec482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Thu, 26 Jun 2014 22:07:02 +0200 Subject: [PATCH 1/5] Translated using Weblate (Azerbaijani) Currently translated at 40.4% (1121 of 2770) --- po/az.po | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/po/az.po b/po/az.po index 322d032b2a..1d113740fd 100644 --- a/po/az.po +++ b/po/az.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-06-24 23:42+0200\n" +"PO-Revision-Date: 2014-06-26 22:07+0200\n" "Last-Translator: Sevdimali İsa \n" "Language-Team: Azerbaijani " "\n" @@ -3828,7 +3828,7 @@ msgstr "" #: libraries/Types.class.php:384 msgid "A point in 2-dimensional space" -msgstr "" +msgstr "2 ölçülü fəzada bir nöqtə" #: libraries/Types.class.php:386 msgid "A curve with linear interpolation between points" @@ -3840,7 +3840,7 @@ msgstr "Poliqon" #: libraries/Types.class.php:390 msgid "A collection of points" -msgstr "" +msgstr "Nöqtələr çoxluğu" #: libraries/Types.class.php:392 msgid "A collection of curves with linear interpolation between points" @@ -3857,7 +3857,7 @@ msgstr "" #: libraries/Types.class.php:650 libraries/Types.class.php:1042 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "Ədədi" #: libraries/Types.class.php:669 libraries/Types.class.php:1045 #| msgid "Create an index" @@ -3879,7 +3879,7 @@ msgstr "Fəza" #: libraries/Types.class.php:776 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" -msgstr "" +msgstr "4-baytlıq tam ədəd, aralıq -2,147,483,648-dən 2,147,483,647-ə qədərdir" #: libraries/Types.class.php:778 msgid "" @@ -4675,34 +4675,37 @@ msgstr "" #: libraries/config/messages.inc.php:65 msgid "CHAR textarea columns" -msgstr "" +msgstr "CHAR mətn sahələri sütunları" #: libraries/config/messages.inc.php:66 msgid "Number of rows for CHAR/VARCHAR textareas." -msgstr "" +msgstr "CHAR/VARCHAR mətn sahələri üçün sətir sayıdır." #: libraries/config/messages.inc.php:67 msgid "CHAR textarea rows" -msgstr "" +msgstr "CHAR mətn sahələri sətirləri" #: libraries/config/messages.inc.php:68 msgid "Check config file permissions" -msgstr "" +msgstr "Config faylları üçün icazələri yoxla" #: libraries/config/messages.inc.php:70 msgid "" "Compress gzip exports on the fly without the need for much memory; if you " "encounter problems with created gzip files disable this feature." msgstr "" +"Daha çox yaddaşa ehtiyac qalmadan gzip eksportları anında sıxışdırır; əgər " +"gzip faylları yaratmaqda problemlərlə qarşılaşarsanız bu özəlliyi deaktiv " +"edin." #: libraries/config/messages.inc.php:73 msgid "Compress on the fly" -msgstr "" +msgstr "Anında sıxışdır" #: libraries/config/messages.inc.php:74 setup/frames/config.inc.php:24 #: setup/frames/index.inc.php:211 msgid "Configuration file" -msgstr "" +msgstr "Konfiqurasiya faylı" #: libraries/config/messages.inc.php:76 msgid "" @@ -4712,7 +4715,7 @@ msgstr "" #: libraries/config/messages.inc.php:79 msgid "Confirm DROP queries" -msgstr "" +msgstr "DROP sorğularını təsdiqlə" #: libraries/config/messages.inc.php:80 msgid "Debug SQL" @@ -4724,7 +4727,7 @@ msgstr "Susmaya görə görüntü təlimatı" #: libraries/config/messages.inc.php:83 msgid "Tab that is displayed when entering a database." -msgstr "" +msgstr "Bir Verilənlər Bazası daxil edildiyində görsənəcək pəncərə(Tab)." #: libraries/config/messages.inc.php:84 msgid "Default database tab" From e80a278113d6219e04a0e148c7e5ef56f69d0dff Mon Sep 17 00:00:00 2001 From: Dhananjay Nakrani Date: Thu, 26 Jun 2014 20:47:44 +0200 Subject: [PATCH 2/5] Translated using Weblate (Hindi) Currently translated at 46.2% (1282 of 2770) --- po/hi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/hi.po b/po/hi.po index 39c284a833..df420e460b 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-06-26 20:35+0200\n" +"PO-Revision-Date: 2014-06-26 20:47+0200\n" "Last-Translator: Dhananjay Nakrani \n" "Language-Team: Hindi \n" "Language: hi\n" @@ -750,7 +750,7 @@ msgstr "संस्करण दिखाएँ" #: index.php:276 #| msgid "Protocol version" msgid "Protocol version:" -msgstr "प्रोटोकॉल वर्ज़न" +msgstr "प्रोटोकॉल वर्ज़न:" #: index.php:280 #, fuzzy From 3f21378e4c5aff430ef23bbaefa6967d5dac89c4 Mon Sep 17 00:00:00 2001 From: Shivam Dixit Date: Sun, 29 Jun 2014 07:14:39 -0400 Subject: [PATCH 3/5] Fix for bug 4027 Signed-off-by: Marc Delisle --- doc/config.rst | 2 +- libraries/config.default.php | 2 +- libraries/sql.lib.php | 12 +++++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index 65ce2b6f39..ff19c35f4d 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2583,7 +2583,7 @@ Various display setting .. config:option:: $cfg['MaxExactCount'] :type: integer - :default: 0 + :default: 500000 For InnoDB tables, determines for how large tables phpMyAdmin should get the exact row count using ``SELECT COUNT``. If the approximate row diff --git a/libraries/config.default.php b/libraries/config.default.php index 916b457b09..cf941b13f2 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2565,7 +2565,7 @@ $cfg['BrowseMIME'] = true; * * @global integer $cfg['MaxExactCount'] */ -$cfg['MaxExactCount'] = 0; +$cfg['MaxExactCount'] = 500000; /** * Zero means that no row count is done for views; see the doc diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index d42555ce4e..276efd6fb3 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1424,11 +1424,21 @@ function PMA_countQueryResults( // However, do not count again if we did it previously // due to $find_real_end == true if ($justBrowsing) { + // Get approximate row count $unlim_num_rows = PMA_Table::countRecords( $db, $table, - true + false ); + if ($unlim_num_rows < $GLOBALS['cfg']['MaxExactCount']) { + // Get the exact count if approximate count + // is less than MaxExactCount + $unlim_num_rows = PMA_Table::countRecords( + $db, + $table, + true + ); + } } else { // add select expression after the SQL_CALC_FOUND_ROWS From 50cf592e9df32f4b2017ad016db267d0bad20be8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 29 Jun 2014 07:16:43 -0400 Subject: [PATCH 4/5] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index d395fd47b9..3190596606 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.2.6.0 (not yet released) - bug #4471 Undefined index warning with referenced column. +- bug #4027 $cfg['MaxExactCount'] is ignored when BROWSING is back 4.2.5.0 (2014-06-26) - bug #4467 shell_exec() has been disabled for security reasons From 5b1fe4e55f34295644e48e6f8fb52aac29c33bc0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 29 Jun 2014 07:22:53 -0400 Subject: [PATCH 5/5] Add comments and todo for the justBrowsing logic Signed-off-by: Marc Delisle --- libraries/sql.lib.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 276efd6fb3..eca00cdf99 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1424,15 +1424,24 @@ function PMA_countQueryResults( // However, do not count again if we did it previously // due to $find_real_end == true if ($justBrowsing) { - // Get approximate row count + // Get row count (is approximate for InnoDB) $unlim_num_rows = PMA_Table::countRecords( $db, $table, false ); + /** + * @todo Can we know at this point that this is InnoDB, + * (in this case there would be no need for getting + * an exact count)? + */ if ($unlim_num_rows < $GLOBALS['cfg']['MaxExactCount']) { // Get the exact count if approximate count // is less than MaxExactCount + /** + * @todo In countRecords(), MaxExactCount is also verified, + * so can we avoid checking it twice? + */ $unlim_num_rows = PMA_Table::countRecords( $db, $table,