[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3ac464: Revert "The DisableIS directive is removed"
Madhura Jayaratne
madhura.cj at gmail.com
Thu Oct 16 15:19:19 CEST 2014
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3ac46455cf032f6e26d6d34df2a6c7e98b7e983a
https://github.com/phpmyadmin/phpmyadmin/commit/3ac46455cf032f6e26d6d34df2a6c7e98b7e983a
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M doc/config.rst
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M test/classes/PMA_Header_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/classes/plugin/import/ImportCsv_test.php
M test/classes/plugin/import/ImportLdi_test.php
M test/classes/plugin/import/ImportMediawiki_test.php
M test/classes/plugin/import/ImportOds_test.php
M test/classes/plugin/import/ImportShp_test.php
M test/classes/plugin/import/ImportSql_test.php
M test/classes/plugin/import/ImportXml_test.php
M test/libraries/PMA_Tracker_test.php
M test/libraries/PMA_mult_submits_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
Log Message:
-----------
Revert "The DisableIS directive is removed"
This reverts commit d8fd82a9f597f7a676ebdc2ad7f7f432b7c14550.
Conflicts:
ChangeLog
doc/config.rst
libraries/config.default.php
libraries/config/messages.inc.php
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 603b31d023b8bc6a15370e00b92febfb14f6a967
https://github.com/phpmyadmin/phpmyadmin/commit/603b31d023b8bc6a15370e00b92febfb14f6a967
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/mysql_charsets.lib.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/libraries/PMA_mysql_charsets_test.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit 57ef25eed8b470cc521ad57d6ed5d79fc66e08e7.
Conflicts:
test/classes/plugin/export/PMA_ExportSql_test.php
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 225b463306cd1b253b90126dbcb1d10de9f9268d
https://github.com/phpmyadmin/phpmyadmin/commit/225b463306cd1b253b90126dbcb1d10de9f9268d
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/Table.class.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit 2ac444acd4715afc86d0e99bd3bc20cd64861c9d.
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: f4f910204b57afd7925b48dc5114229492c1dc20
https://github.com/phpmyadmin/phpmyadmin/commit/f4f910204b57afd7925b48dc5114229492c1dc20
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node_Database.class.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit e94f74fa51662a06ca2775255dd5039753d78844.
Conflicts:
libraries/navigation/Nodes/Node_Database.class.php
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 3f9260d3a88facd4c26a04fd8a310017706ad50e
https://github.com/phpmyadmin/phpmyadmin/commit/3f9260d3a88facd4c26a04fd8a310017706ad50e
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node_Table.class.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit 89d6473f49a6faf6d2e0b2fc09960f028bdb2c63.
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 62b15dc2f651a3127de51d1ca7a5e00b651f4803
https://github.com/phpmyadmin/phpmyadmin/commit/62b15dc2f651a3127de51d1ca7a5e00b651f4803
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
M test/classes/navigation/PMA_Node_test.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit 8fd0d79405c0efb0d2dbe6fce45c1340fb92a4da.
Conflicts:
libraries/navigation/Nodes/Node.class.php
test/classes/navigation/PMA_Node_test.php
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 5cb87ecf30623cba3d48595fa6f809a1fbf4d365
https://github.com/phpmyadmin/phpmyadmin/commit/5cb87ecf30623cba3d48595fa6f809a1fbf4d365
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit 4905240aedd8bb1375c10bae8aaff9df64092e71.
Conflicts:
libraries/DatabaseInterface.class.php
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 2c188c010997808f0259e8497d3fc4b54e7018e3
https://github.com/phpmyadmin/phpmyadmin/commit/2c188c010997808f0259e8497d3fc4b54e7018e3
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit 60938c67fadb044f6efadff7ecbebe22dc643e5c.
Conflicts:
libraries/DatabaseInterface.class.php
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 19432a02cc218e7469dc8c123f73b10ab47c872c
https://github.com/phpmyadmin/phpmyadmin/commit/19432a02cc218e7469dc8c123f73b10ab47c872c
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit 3065a3edcf88f8171fe060a8bc3e91db6573028d.
Conflicts:
libraries/DatabaseInterface.class.php
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: adde7776395d7ef462f2c7600e8388d29f853aca
https://github.com/phpmyadmin/phpmyadmin/commit/adde7776395d7ef462f2c7600e8388d29f853aca
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
Log Message:
-----------
Revert "The DisableIS directive is being deprecated"
This reverts commit b0962e8fd875fe067d38adaccdbdf6a21f7ffcbd.
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 3e3e46fa27e697d7c144e3da167eab687d0ca775
https://github.com/phpmyadmin/phpmyadmin/commit/3e3e46fa27e697d7c144e3da167eab687d0ca775
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
Log Message:
-----------
Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 719013f65678ddbcc276602844b243e129163f15
https://github.com/phpmyadmin/phpmyadmin/commit/719013f65678ddbcc276602844b243e129163f15
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
M libraries/navigation/Nodes/Node_Table.class.php
Log Message:
-----------
User Server reference
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: d441a217ec7331f3f03194f215af8d772509e26e
https://github.com/phpmyadmin/phpmyadmin/commit/d441a217ec7331f3f03194f215af8d772509e26e
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths:
M test/classes/navigation/PMA_NavigationTree_test.php
M test/classes/navigation/PMA_Node_test.php
Log Message:
-----------
Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: b587d7cd3d4feaeb1cb0439eefb6887bdbeef860
https://github.com/phpmyadmin/phpmyadmin/commit/b587d7cd3d4feaeb1cb0439eefb6887bdbeef860
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M test/classes/navigation/PMA_Node_test.php
M test/libraries/PMA_structure_test.php
Log Message:
-----------
Fix more failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 185c45e190cd2bd19840f6d31900d6c0e71a2ff9
https://github.com/phpmyadmin/phpmyadmin/commit/185c45e190cd2bd19840f6d31900d6c0e71a2ff9
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node_Database.class.php
Log Message:
-----------
Take $singleItem parameter into consideration for non IS queries
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 28e2642054dde9261721abdcd7e18df27885c67e
https://github.com/phpmyadmin/phpmyadmin/commit/28e2642054dde9261721abdcd7e18df27885c67e
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node_Database.class.php
Log Message:
-----------
Move duplicate code to a method
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 92ccb972e37a8bedd01c6b4248d6c537be9e410b
https://github.com/phpmyadmin/phpmyadmin/commit/92ccb972e37a8bedd01c6b4248d6c537be9e410b
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M ChangeLog
M libraries/navigation/NavigationTree.class.php
M libraries/server_privileges.lib.php
M po/de.po
M test/libraries/PMA_server_privileges_test.php
Log Message:
-----------
Merge branch 'master' into DisableIS
Commit: 9373830149dd63dcf7ea876b4a61dd7366bc9b68
https://github.com/phpmyadmin/phpmyadmin/commit/9373830149dd63dcf7ea876b4a61dd7366bc9b68
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Make SHOW DATABASES aware of only_db and hide_db
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: b4150ea75c0137f451c5a346a1aab761149f5246
https://github.com/phpmyadmin/phpmyadmin/commit/b4150ea75c0137f451c5a346a1aab761149f5246
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Use upper case for SQL key words
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 1ddf4fea57d5bcdc52876a4796affcc7b989539f
https://github.com/phpmyadmin/phpmyadmin/commit/1ddf4fea57d5bcdc52876a4796affcc7b989539f
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Adhere to NavigationTreeEnableGrouping
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 1f235fb30bb0e6d410b82491548a5aa6fb9f223e
https://github.com/phpmyadmin/phpmyadmin/commit/1f235fb30bb0e6d410b82491548a5aa6fb9f223e
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-11 (Sat, 11 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Show tables based getData implementation
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 9b428aa6b32730bc481394f217b9443e8953e43c
https://github.com/phpmyadmin/phpmyadmin/commit/9b428aa6b32730bc481394f217b9443e8953e43c
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Use caps for SQL keywords
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: c925d46f9252c7eb07b2e5a546c8175341f39202
https://github.com/phpmyadmin/phpmyadmin/commit/c925d46f9252c7eb07b2e5a546c8175341f39202
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)
Changed paths:
M libraries/dbi/DBIDummy.class.php
M test/classes/navigation/PMA_Node_test.php
Log Message:
-----------
Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 98ea25d9ea8fe55145c4580b23776f3694e98aca
https://github.com/phpmyadmin/phpmyadmin/commit/98ea25d9ea8fe55145c4580b23776f3694e98aca
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-14 (Tue, 14 Oct 2014)
Changed paths:
M test/classes/navigation/PMA_Node_test.php
Log Message:
-----------
Additional unit tests for new execution paths
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 6ebca5a49d6f15547ef6b4a6ce251f100ff2ad17
https://github.com/phpmyadmin/phpmyadmin/commit/6ebca5a49d6f15547ef6b4a6ce251f100ff2ad17
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-15 (Wed, 15 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
Log Message:
-----------
Fix privilege checking queries
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 6daef8eee86c44dc74f34b2d691673c2cd2137db
https://github.com/phpmyadmin/phpmyadmin/commit/6daef8eee86c44dc74f34b2d691673c2cd2137db
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-15 (Wed, 15 Oct 2014)
Changed paths:
M libraries/dbi/DBIDummy.class.php
Log Message:
-----------
Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 771847102f7ea483b7e5c81d911fe7aaf994c4bb
https://github.com/phpmyadmin/phpmyadmin/commit/771847102f7ea483b7e5c81d911fe7aaf994c4bb
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-15 (Wed, 15 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
M test/classes/navigation/PMA_NavigationTree_test.php
M test/libraries/PMA_server_collations_test.php
Log Message:
-----------
SHOW GRANTS based privilege checking
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 6031f7a0bc00e62eaa60cd496bd1e9bee830f622
https://github.com/phpmyadmin/phpmyadmin/commit/6031f7a0bc00e62eaa60cd496bd1e9bee830f622
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-15 (Wed, 15 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
Log Message:
-----------
Remove outdated comment
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 492d0f133f8b8cc05a38e4024d09488716b86124
https://github.com/phpmyadmin/phpmyadmin/commit/492d0f133f8b8cc05a38e4024d09488716b86124
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
M libraries/Table.class.php
M libraries/structure.lib.php
Log Message:
-----------
Additional fix for bug #3869. Consider tables in information_schema as views to benefit from 'MaxExactCountViews' and avoid count(*) in information_schema tables
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 3c2f85774e26513e135ad7581b613739cfa068f4
https://github.com/phpmyadmin/phpmyadmin/commit/3c2f85774e26513e135ad7581b613739cfa068f4
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M libraries/DatabaseInterface.class.php
Log Message:
-----------
Initialize the array
Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>
Commit: 8059f3fff0aaca98a6a421c1ebdfa4ac2a332e1e
https://github.com/phpmyadmin/phpmyadmin/commit/8059f3fff0aaca98a6a421c1ebdfa4ac2a332e1e
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M doc/config.rst
M libraries/DatabaseInterface.class.php
M libraries/Table.class.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/dbi/DBIDummy.class.php
M libraries/mysql_charsets.lib.php
M libraries/navigation/Nodes/Node.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/navigation/Nodes/Node_Table.class.php
M libraries/structure.lib.php
M test/classes/PMA_Header_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
M test/classes/navigation/PMA_NavigationTree_test.php
M test/classes/navigation/PMA_Node_test.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/classes/plugin/import/ImportCsv_test.php
M test/classes/plugin/import/ImportLdi_test.php
M test/classes/plugin/import/ImportMediawiki_test.php
M test/classes/plugin/import/ImportOds_test.php
M test/classes/plugin/import/ImportShp_test.php
M test/classes/plugin/import/ImportSql_test.php
M test/classes/plugin/import/ImportXml_test.php
M test/libraries/PMA_Tracker_test.php
M test/libraries/PMA_mult_submits_test.php
M test/libraries/PMA_mysql_charsets_test.php
M test/libraries/PMA_server_collations_test.php
M test/libraries/PMA_structure_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
Log Message:
-----------
Merge pull request #1375 from madhuracj/DisableIS
Performance improvements related to IS
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6150914fe589...8059f3fff0aa
More information about the Git
mailing list