Commit Graph

123 Commits

Author SHA1 Message Date
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
Hugues Peccatte
b4b506af2f Coding style modification.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-14 16:14:32 +02:00
Hugues Peccatte
5985894160 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-07 00:31:45 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Hugues Peccatte
570ca18011 PHPDoc update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-08-19 17:23:41 +02:00
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-01 19:50:12 +05:30
Tim Siebels
d9cbf2664c Fix default port to null for hhvm
HHVM doesn't allow false to be passed as port to mysqli_real_connect.
It only allows a nullable integer until ZendParamMode is finished.

See facebook/hhvm#1817

Signed-off-by: Tim Siebels <tim_siebels_aurich@yahoo.de>
2014-07-24 17:54:21 +02:00
Chirayu Chiripal
04a3a7073b RFE-1488/781: User privilege tab not shown in all relevant cases
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-18 00:13:08 +05:30
Isaac Bennetch
175c1a786a Merge pull request #1276 from D-storm/FR-637
RFE-637: Custom field handlers (input transformations)
2014-07-12 09:45:35 -04:00
Marc Delisle
a9296005c1 Improve variable name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-12 07:25:47 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-12 01:52:32 +05:30
Marc Delisle
f20ac45096 Ensure variable is a string
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-11 07:28:52 -04:00
Michal Čihař
ddac366fd6 Merge remote-tracking branch 'origin/QA_4_2'
Conflicts:
	libraries/DatabaseInterface.class.php
2014-06-12 13:37:35 +02:00
Chirayu Chiripal
2bd9544878 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-12 16:55:27 +05:30
Michal Čihař
4c328aaf03 Remove workaround for older MySQL versions
Remove workaround originally implemented for MySQL < 5.0.2, but also
useful in 5.1.x times for listing tables within database when
permissions on one of database directories are wrong.

I've tested this with several MySQL versions and it does not seem to be
needed now, the INFORMATION SCHEMA works correctly even if some of the
database directories have wrong permissions.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-10 11:57:14 +02:00
Michal Čihař
dbd18940be Remove explicit unsetting of local variables
This was useful in global scope, but makes no sense when used inside
method as all it's variables are cleaned up anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-10 09:50:02 +02:00
Michal Čihař
697cbf22d5 Simplify code
foreach on empty list does nothing, so we can skip the initial
condition.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-10 09:50:02 +02:00
Michal Čihař
ecfcba84f1 Correct parameter types
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-10 09:26:08 +02:00
Michal Čihař
54564305b6 Query options are integer (and are so handled in other methods)
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Madhura Jayaratne
3c21181678 Remove extra empty line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-06-06 18:19:30 +05:30
Michal Čihař
d6a3abcf81 Fix method call
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 12:54:21 +02:00
Michal Čihař
cbac30c99a Document that fetchResult can take array
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 11:34:38 +02:00
Michal Čihař
de7255f120 Share code for generating JOIN query for Drizlle
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 11:32:17 +02:00
Michal Čihař
7bc9eba9bc One place to generate KILL query
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 11:08:40 +02:00
Michal Čihař
1beb22fddc Merge pull request #1205 from duncan3dc/amazon_rds
Allow processes to be killed on Amazon RDS
2014-06-05 22:36:35 +02:00
Craig Duncan
17fd6b576a Dynamically detect an amazon rds instance
This is to avoid more configuration options

Signed-off-by: Craig Duncan <git@duncanc.co.uk>
2014-06-05 19:38:57 +01:00
Michal Čihař
1ca50ed73e Adjust comment as this returns bool
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-04 10:15:20 +02:00
Madhura Jayaratne
839094612a Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-10 13:00:26 +02:00
Michal Čihař
b1915bade0 The storeResult needs mysqli lin parameter to operate
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 16:29:56 +02:00
Michal Čihař
cb6b37f19d Remove extra spaces
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 15:57:45 +02:00
Michal Čihař
38febf6daf Pass correct parameter
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 15:47:44 +02:00
Michal Čihař
53eca3b2cb Share code for backtrace formatting
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 14:44:41 +02:00
Michal Čihař
b3700d3450 Remove unused code
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 14:18:06 +02:00
Michal Čihař
a2d5c59a72 Correct type annontation for DBI
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 14:08:58 +02:00
Michal Čihař
09e15add26 Move getting link to the wrapper class so that the drivers always get right link parameter
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 12:36:59 +02:00
Michal Čihař
5f4c3b841e Share code in DBI->fetchResult
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 12:16:00 +02:00
Michal Čihař
67965902ad Let getLink detect when userlink is null
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 11:30:03 +02:00
Michal Čihař
3690415c70 Share code for getting mysql link object
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 11:09:39 +02:00
Michal Čihař
c249246e10 Share code for caching affected rows
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 11:03:12 +02:00
Michal Čihař
2f312320f7 Move require to the correct place
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 10:42:59 +02:00