[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25811-gfc928ad

[Marc Delisle]

The branch, master has been updated
       via  fc928ad7b6bf491b83713dfc8979cfeebf0dbd7f (commit)
      from  04b01182c4dafd9a278637e917d7b622da127784 (commit)


- Log -----------------------------------------------------------------
commit fc928ad7b6bf491b83713dfc8979cfeebf0dbd7f
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Jan 5 07:57:12 2012 -0500

    bug #3093145 [display] Page through rows returned from a view

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

Summary of changes:
 ChangeLog                    |    1 +
 Documentation.html           |    2 +-
 libraries/config.default.php |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba7c9fe..c5622a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog
 - bug #3442069 [AJAX] database list not updated after adding/deleting a user + database
 - bug #3461750 [edit] Sort by key generates wrong sql with limit clause
 - bug #3340842 [structure] Error dropping index of non-existing column
+- bug #3093145 [display] Page through rows returned from a view
 
 3.4.10.0 (not yet released)
 - bug #3460090 [interface] TextareaAutoSelect feature broken
diff --git a/Documentation.html b/Documentation.html
index 7ddf464..48f9a89 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2248,7 +2248,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <dt id="cfg_MaxExactCountViews">$cfg['MaxExactCountViews'] integer</dt>
     <dd>For VIEWs, since obtaining the exact count could have an
     impact on performance, this value is the maximum to be displayed, using
-    a <code>SELECT COUNT ... LIMIT</code>. The default value of 0 bypasses
+    a <code>SELECT COUNT ... LIMIT</code>. Setting this to 0 bypasses
     any row counting.
     </dd>
 
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 8dff000..94005b7 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2426,7 +2426,7 @@ $cfg['MaxExactCount'] = 20000;
  *
  * @global integer $cfg['MaxExactCountViews']
  */
-$cfg['MaxExactCountViews'] = 0;
+$cfg['MaxExactCountViews'] = 100000;
 
 /**
  * Sort table and database in natural order


hooks/post-receive
-- 
phpMyAdmin