Commit Graph

166 Commits

Author SHA1 Message Date
Hugues Peccatte
e1d0646fed Make PHPcs happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-05-23 01:21:30 +02:00
Madhura Jayaratne
d465bc0e5f Fix collation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 19:00:04 +05:30
Madhura Jayaratne
535c1a4cb5 Adhere to DisableIS here as well
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 16:19:19 +05:30
Madhura Jayaratne
9323bd5044 Allow avoiding querying information_schema for listing routines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 16:10:55 +05:30
Madhura Jayaratne
f2fc6b335d There is a comment field for routines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 15:29:45 +05:30
Madhura Jayaratne
7d9222fbfc Match column names returned by SHOW query
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 12:44:09 +05:30
Madhura Jayaratne
1b968b4e87 Respect DisableIS directive when fetching events
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 12:43:12 +05:30
Madhura Jayaratne
5abed64ae1 Remove unused parameter
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 12:08:07 +05:30
Madhura Jayaratne
75d5890022 bug #4910 Slowness due to large number of routines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-19 12:00:13 +05:30
Jason
ce3c8b0c66 Refactoring tbl_view.lib and add PMA\Template
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-05-15 03:48:25 +08:00
Madhura Jayaratne
5857fe163d Fix spacing after opening brace
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-28 11:05:08 +05:30
Marc Delisle
0fe34e4ef2 Merge branch 'QA_4_4' 2015-04-21 11:28:35 -04:00
Marc Delisle
b0ddd7e743 bug #4861 Use of undefined constant PMA_DRIZZLE
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-21 11:28:08 -04:00
Madhura Jayaratne
c177ebeaea Avoid loose comparing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 18:11:12 +05:30
Madhura Jayaratne
3e77c708b4 Check whether query succeeded
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 18:02:38 +05:30
Madhura Jayaratne
865eb0cda6 Another instance of loose comparing fixed
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 17:54:20 +05:30
Madhura Jayaratne
f05f535210 Scrutinizer does not like loose comparing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 17:52:51 +05:30
Madhura Jayaratne
f6e0d94f1a _dbgQuery also accepts false
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 17:41:37 +05:30
Madhura Jayaratne
f3b7d693ec bug #4814 MySQL 5.7.6 and Databases
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 09:21:29 +05:30
Madhura Jayaratne
a07548273f Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-25 21:29:19 +05:30
Madhura Jayaratne
209f9c6de7 bug #4778 SQL error when database list is sorted by additional columns
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-25 21:25:07 +05:30
Madhura Jayaratne
2e0167b079 Update return types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-13 15:16:13 +05:30
Madhura Jayaratne
8a2b870b04 Empty string makes more sense as the default value for table name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-13 15:05:31 +05:30
Madhura Jayaratne
76e3ec78c2 rfe #1179 Speed up slow triggers by using EVENT_OBJECT_SCHEMA
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-06 11:24:02 +05:30
Madhura Jayaratne
2eab3b5880 bug #4727 Collation column missing in database list when DisableIS is true
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 17:31:03 +05:30
Marc Delisle
27540ea81a Bug Undefined constant PMA_DRIZZLE
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-18 06:36:23 -05:00
Marc Delisle
a41ddf562e Bug Null argument in array_multisort()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-11 05:50:17 -05:00
Madhura Jayaratne
0bca6a096f Determine the databases the user has access to based on GRANTs and query only for them
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 08:13:58 +05:30
Hugues Peccatte
42e0bdd47a Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 18:32:42 +01:00
Hugues Peccatte
026c31fab6 Fix PHPCS issues.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 14:59:19 +01:00
Hugues Peccatte
5e7fa3b821 Remove unused local variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 14:52:20 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 18:37:49 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
b58f072c75 Fix parameter type warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-24 14:25:21 -04:00
Ann + J.M
953e865fc6 Fix coding style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-10-22 20:44:50 +02:00
Marc Delisle
dde9ca7c79 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-21 10:38:46 -04:00
Madhura Jayaratne
bd68c54d1b bug #4562 [security] XSS in debug SQL output
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-21 08:42:02 +05:30
Hugues Peccatte
74f0beda8f Fix syntax error.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 20:56:12 +02:00
Madhura Jayaratne
a87294fbe4 Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 08:28:05 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-16 13:32:15 -04:00
Madhura Jayaratne
3c2f85774e Initialize the array
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-16 17:52:23 +05:30
Madhura Jayaratne
492d0f133f 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@gmail.com>
2014-10-16 14:59:45 +05:30
Madhura Jayaratne
6031f7a0bc Remove outdated comment
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-15 10:58:46 +05:30
Madhura Jayaratne
771847102f SHOW GRANTS based privilege checking
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-15 10:55:33 +05:30
Madhura Jayaratne
6ebca5a49d Fix privilege checking queries
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-15 07:43:59 +05:30
Madhura Jayaratne
3e3e46fa27 Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:56:10 +05:30
Madhura Jayaratne
adde777639 Revert "The DisableIS directive is being deprecated"
This reverts commit b0962e8fd8.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:32:51 +05:30
Madhura Jayaratne
19432a02cc Revert "The DisableIS directive is being deprecated"
This reverts commit 3065a3edcf.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:32:45 +05:30
Madhura Jayaratne
2c188c0109 Revert "The DisableIS directive is being deprecated"
This reverts commit 60938c67fa.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:32:23 +05:30
Madhura Jayaratne
5cb87ecf30 Revert "The DisableIS directive is being deprecated"
This reverts commit 4905240aed.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:32:17 +05:30