gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,343 Commits 12 Branches 481 Tags 2.4 GiB
fe3d80bb95
Commit Graph

92343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
fe3d80bb95 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-09 15:21:26 +02:00
Marc Delisle
2e089b4d8b Add a JQplot option to change the dot size in server status monitor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 15:19:06 +02:00
Michal Čihař
d44c4d9a96 Properly report MySQL error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:12:06 +02:00
Michal Čihař
650e0512de Share code for getting error message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:05:36 +02:00
Michal Čihař
f420f1bcfd Document possible bug in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:57:10 +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ř
eb9a4b7771 Separate backtrace formatting from error handling 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:44:41 +02:00
Michal Čihař
82b4549176 Remove unused parameter of PMA_Util::cacheUnset 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:21:12 +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ř
e24fffa7a4 Merge remote-tracking branch 'origin/QA_4_2' 2014-05-09 14:09:19 +02:00
Michal Čihař
a55100e4fe Better way to generate drizzle field flags 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:08:58 +02:00
Michal Čihař
11d48bbca0 Better variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:08:58 +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ř
514e1c6356 Include missing parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:08:58 +02:00
Claus Svalekjaer
6b5f3074fb Translated using Weblate (Danish) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-09 13:53:43 +02:00
Claus Svalekjaer
0fb85ab2e8 Translated using Weblate (Danish) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-09 13:53:39 +02:00
Michal Čihař
1f669982f8 Adjust test to new API 
Also mark as incomplete tests which really did not test anything.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 12:46:22 +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ř
fff4a34c48 Move coverage upload to after_script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:58:29 +02:00
Michal Čihař
1590e23868 We no longer need to mock the dbi object 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:56:45 +02:00
Michal Čihař
c3fab4b047 Send coverage report from Travis to Scrutinizer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:41:30 +02:00
Michal Čihař
e65027e080 Check return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:36:24 +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ř
302bda9961 Fix typo in method name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:27:55 +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
Michal Čihař
4631131cbc We default to TCP connection, so I believe this is correct value here 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:33:02 +02:00
Michal Čihař
4d8e361822 Update po files 2014-05-09 10:24:35 +02:00
Michal Čihař
e2f9431501 Pass correct parameter to postConnect 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:23:45 +02:00
Michal Čihař
1273c3349c Return null for not set socket 
This is correct value for unset socket.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:19:03 +02:00
Michal Čihař
d9f44a64bf Oops, another typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:16:01 +02:00
Michal Čihař
79bc9ea150 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:15:09 +02:00
Michal Čihař
b82e706dcb Share post connect code between DBIs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:12:55 +02:00
Michal Čihař
9e8505ff5e Factor out socket/port parsing for connecting database 
Almost same code was used in three DBIs, so let's share it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:01:35 +02:00
Marc Delisle
bd73eb3068 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-09 09:51:00 +02:00
Marc Delisle
a391dd93ab Use dot notation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 09:50:46 +02:00
Michal Čihař
39339112f3 Fix access to global variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:43:09 +02:00
Michal Čihař
4443209707 Do not call DBI->postConnect for control link 
It used to just return, so there is no sense in calling it at all.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:41:56 +02:00
Michal Čihař
69a9cb1e58 Share logic for calling postConnect method 
This should be called on success, when we're creating primary
connection.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:41:56 +02:00
Marc Delisle
963197cad1 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 09:41:13 +02:00
Marc Delisle
d3e5525913 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-09 09:29:30 +02:00
Marc Delisle
05533da471 Use dot notation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 09:28:16 +02:00
Michal Čihař
60ea7a18d7 Remove insertId from the interface and dummy DBIs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:28:11 +02:00
Michal Čihař
f6ffaa1e27 This code has no effect 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:24:53 +02:00
Michal Čihař
510825c97e Share implementation of insertId among DBIs 
There is no need to have the method implemented three times.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:21:11 +02:00
Michal Čihař
69beffffee Simplify code for getting field flags 
Let's define array of flag names, so that we don't have to duplicate the
code for each flag.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:15:34 +02:00
Hugues Peccatte
5306fcc9c6 Minor coding style fixes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-08 21:51:24 +02:00
Madhura Jayaratne
8f1fcd5e6e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-08 18:06:57 +02:00