Commit Graph

216 Commits

Author SHA1 Message Date
Madhura Jayaratne
7cf678f79d bug #4664 select min() displays 1 row, but reports the table amount of rows returned
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 15:03:23 +05:30
Hugues Peccatte
603498a6fc Fix #4593 Manual SELECT doesn't change active table
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 14:01:55 +01:00
Madhura Jayaratne
3b3bd0c2eb Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 10:41:56 +05:30
Madhura Jayaratne
ffcd97aa48 bug #4404 Recordset return from procedure display nothing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 10:28:58 +05:30
Hugues Peccatte
2b4d6c955e Remove duplicated js function.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-03 21:57:55 +01:00
Hugues Peccatte
42e0bdd47a Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 18:32:42 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances.
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 17:40:09 +01:00
Marc Delisle
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style
RFE 1550: PMA_URL_getCommon(): new style
2014-10-28 08:14:45 -04:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
e92107b9b5 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-24 13:00:23 -04:00
Chanaka Dharmarathna
b1b6232c04 Remove dead codes
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-10-22 23:08:13 +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
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
2014-10-18 19:42:29 +02:00
Marc Delisle
4f6b4bb412 Remove doc for unused parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-13 09:12:05 -04:00
Marc Delisle
efdde2ec22 Remove unused parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-13 08:14:01 -04:00
Marc Delisle
21f1716f81 Remove incorrect parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-13 08:09:11 -04:00
Marc Delisle
759c2065b6 Fix code execution path warning and coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-12 09:14:18 -04:00
Marc Delisle
a728099e01 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-12 08:42:51 -04:00
Hugues Peccatte
48bd3b8ee5 Remove unused $pmaString.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-05 10:42:44 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-28 20:53:01 +02:00
Hugues Peccatte
ebda4090db Coding style modifications.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-14 15:47:14 +02:00
Marc Delisle
2b7ef3f31f Merge branch 'QA_4_2' 2014-09-11 08:12:32 -04:00
Marc Delisle
1ef714febe bug #4529 Undefined index: pos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-11 08:12:06 -04:00
Marc Delisle
f8742726a6 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-10 19:19:14 -04: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
fe452a7240 Make Scrutinizer happier.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 13:56:42 +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
Marc Delisle
8c89232f1d Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-27 08:26:59 -04:00
Chanaka Dharmarathna
7969336d04 rfe-1502 : Smart sorting for int keys
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-08-26 21:44:05 +05:30
Marc Delisle
8c234c1b49 Fix parameter type
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-24 07:55:29 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-11 18:33:59 +05:30
Marc Delisle
1703705c7a Fix execution path notice
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-29 12:03:52 -04:00
chanaka
237b00cc00 Fixed some codesniffer errors
Signed-off-by: chanaka <chanaka@oneit.com.au>
2014-07-28 21:49:11 +05:30
Marc Delisle
5aee521030 Merge branch 'QA_4_2' 2014-07-07 06:36:11 -04:00
Marc Delisle
ca9ad6015a Undefined variable when grid editing a foreign key column
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-07 06:35:30 -04:00
Ann + J.M
64fddc4c6e Fix PHPDoc param types for PMA_executeQueryAndSendQueryResponse
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-07-02 21:28:39 +02:00
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Marc Delisle
5b1fe4e55f Add comments and todo for the justBrowsing logic
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-29 07:22:53 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-29 07:14:39 -04:00
Marc Delisle
e1b598ff1e Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-25 13:05:57 -04:00
Chirayu Chiripal
026c8184dd bug-4473: incorrect result count when having clause is used w/o group by
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-25 14:24:57 +05:30
Marc Delisle
3c84487ca0 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-22 14:56:54 -04:00
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables.
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-06-22 22:41:23 +05:30
Ann + J.M
6b778e09d9 Fix coding style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-22 16:34:34 +02:00
Marc Delisle
8ea7d15c16 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-16 12:44:27 -04:00
Marc Delisle
9b1a29131a Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-16 12:34:10 -04:00
Marc Delisle
ed9265489b Merge branch 'QA_4_2' 2014-06-15 10:10:18 -04:00
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-15 10:07:38 -04:00
Michal Čihař
98034ba148 Remove $GLOBALS['cfg']['Bookmark'] variable
It makes it impossible to include bookmark library at any time as when
it is included before configuration is loaded it caches false result for
bookmarks support.

And anyway, using superglobals is always bad idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-12 13:45:03 +02:00
Madhura Jayaratne
9a12fe5d0b Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-06-06 18:23:56 +05:30