gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,546 Commits 12 Branches 481 Tags 2.4 GiB
3363f10880
Commit Graph

12391 Commits

Author SHA1 Message Date
Hugues Peccatte
3363f10880 Rename ImportSQL method. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 21:06:17 +02:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Marc Delisle
8a3bf5af9f Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-20 13:14:05 -04:00
Marc Delisle
9680410019 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-19 10:13:07 -04:00
Chirayu Chiripal
b21314179b phpdoc variable type fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-10-19 16:59:14 +05:30
Hugues Peccatte
4b9058faa9 Manage escaped quotes. 
Improve process not to look for the same thing many times.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 23:57:54 +02:00
Hugues Peccatte
d936df12d2 Manage option to read SQL as a multibytes string or not. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 20:31:54 +02:00
Madhura Jayaratne
c4f67f05c8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-18 20:40:37 +05:30
Madhura Jayaratne
d0b1002893 Include by default 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-18 20:15:10 +05:30
Marc Delisle
3ec96cb038 Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-18 08:31:26 -04:00
Madhura Jayaratne
fa3c538341 Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 15:08:28 +05:30
Madhura Jayaratne
6086856d24 Wrap a long line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 15:08:07 +05:30
Madhura Jayaratne
00f2788a66 bug #4560 PHP error on master branch 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:35:16 +05:30
Madhura Jayaratne
ae148f37e6 Merge branch 'QA_4_2' 2014-10-17 13:16:45 +05:30
Madhura Jayaratne
bdd76f18ce bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:14:28 +05:30
Madhura Jayaratne
55114b95e0 Wrap more long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:07:25 +05:30
Madhura Jayaratne
8ef9ced453 Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 12:51:28 +05:30
Madhura Jayaratne
55d90fd018 Bug #4561 PHP error in transformations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 12:49:18 +05:30
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
Chanaka Dharmarathna
3e70eb4789 Resolved merge conflict in Changelog 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-17 00:41:07 +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
Marc Delisle
5b5953b371 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 10:47:28 -04:00
Marc Delisle
5efd2feb49 Merge pull request #1378 from nisargjhaveri/bug_4558 
bug #4558 Unable to Add Rows while Creating Table
 2014-10-16 10:39:39 -04:00
Nisarg Jhaveri
310b76c585 bug #4558 Unable to Add Rows while Creating Table 
- Remove inline JS from add column button.
- Remove unnecessary eventhandler to submit form on enter.
- Added event handler to add column field to add on enter.
- Fix tests

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-16 19:43:52 +05:30
Madhura Jayaratne
8059f3fff0 Merge pull request #1375 from madhuracj/DisableIS 
Performance improvements related to IS
 2014-10-16 18:49:18 +05:30
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
6daef8eee8 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 09:43:06 +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
Marc Delisle
32c1192351 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-14 12:12:49 -04:00
Madhura Jayaratne
c925d46f92 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 15:21:15 +05:30
Madhura Jayaratne
9b428aa6b3 Use caps for SQL keywords 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 15:18:50 +05:30
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
558e76ca55 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-12 14:56:04 -04:00
Hugues Peccatte
217644347a Fix merge issue. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 19:00:15 +02:00
Hugues Peccatte
2da2c4caf6 Reduce size of data to read. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:51:02 +02:00
Hugues Peccatte
713a4ef901 Execute query. 
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:45:43 +02:00
Hugues Peccatte
3f9b63f572 Improve SQL reading. 
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:36:54 +02:00
Marc Delisle
3fb80ff57f Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-12 10:02:08 -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
Madhura Jayaratne
1f235fb30b Show tables based getData implementation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-11 20:52:58 +05:30
Marc Delisle
4fb60125fb 4.2.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:49:52 -04:00
Hugues Peccatte
5cfefb8f82 Fix comment read. 
Improve loops.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-10 22:20:33 +02:00
Marc Delisle
8aa7a15ee0 Code cleanup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-10 08:56:58 -04:00
Marc Delisle
9d187c0df6 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-10 08:03:25 -04:00