Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2004-01-09 17:17:35 +0300
committerMarc Delisle <marc@infomarc.info>2004-01-09 17:17:35 +0300
commit26060a0ae94f4817f6befe64b8d4b726127d89fc (patch)
tree17b552a211fc965932d6146605c685ffc23537d7
parent13f274c4e7563febaaa31e3991018138c29527da (diff)
-rwxr-xr-xChangeLog3
-rw-r--r--libraries/sqlparser.data.php3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 85ff9889d2..48073ec0d7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
+2004-01-09 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/sqlparser.data.php: bug 873236 SQL_CALC_FOUND_ROWS
+
2004-01-07 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php, /display_tbl_links.lib.php:
bug 857743, SHOW errors
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index ee43329de0..d4b393d703 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -405,6 +405,7 @@ $PMA_SQPdata_reserved_word = array (
'SQL_BIG_TABLES',
'SQL_BUFFER_RESULT',
'SQL_CACHE',
+ 'SQL_CALC_FOUND_ROWS',
'SQL_LOG_BIN',
'SQL_LOG_OFF',
'SQL_LOG_UPDATE',
@@ -453,7 +454,7 @@ $PMA_SQPdata_reserved_word = array (
'YEAR_MONTH'
);
//$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
-$PMA_SQPdata_reserved_word_cnt = 258;
+$PMA_SQPdata_reserved_word_cnt = 259;
$PMA_SQPdata_column_type = array (
'BIGINT',