Commit Graph

27 Commits

Author SHA1 Message Date
Michal Čihař
56046cc7e2 Simplify getting storage engine
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ENGINE') to this method

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-20 17:56:08 +01:00
Vishal Pandey
5da44ce1a6 Move the tbl_info.inc.php code to Table class
Fixes #12567

Signed-off-by: flash1452 <vishpandey2014@gmail.com>
2017-03-20 17:55:21 +01:00
Michal Čihař
27fb0b58af Merge branch 'QA_4_6'
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-01-23 13:56:35 +01:00
Scrutinizer Auto-Fixer
58b16e73c8 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-12-13 15:16:11 +00:00
Michal Čihař
ef4e584eea Fix return value documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-13 16:13:18 +01:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
2016-10-29 10:45:12 +05:30
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-16 10:29:21 +02:00
Michal Čihař
8f74b63430 Merge branch 'QA_4_6' 2016-08-17 11:39:06 +02:00
Pavel Rochnyack
5a5ae580f2 Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support.
+ Add 'COLUMNS Partitioning' support
+ Allow to edit partition names
* Do not show duplicate partition names in 'Partition maintenance' snippet on 'Operations' tab. Caused by subpartitions presence.
* Optimize Partition::getPartitionMethod() - need only one row, so use 'LIMIT 1' in query to avoid much data transfer from database.
* Change HTML-code of partition comment textarea to avoid extra spaces added to value.
* Added missing htmlspecialchars() on subpartitions comment.

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
2016-08-14 12:26:01 +01:00
Michal Čihař
b33d7f4bd5 Merge branch 'QA_4_6' 2016-04-26 16:37:36 +02:00
Michal Čihař
df08b53e43 Fixed editing of VIEW structure
Fixes #12171

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-26 16:37:20 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:55:42 +02:00
Madhura Jayaratne
263bd601e6 Remove bookmark library includes
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-03-09 23:57:09 +11:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Madhura Jayaratne
33718de82f Fix #11923 Errors on Structure tab when user only has select access on certain columns
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-02-11 10:54:36 +11:00
Michal Čihař
0252c13613 Fix class name
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-14 09:43:57 +01:00
Michal Čihař
37004337ab Merge commit 'a478437e0ee4d74ec5036cb32e165da002303dd1' 2016-01-14 09:10:43 +01:00
Michal Čihař
a37273c5ba Initialize array variables
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-05 11:07:51 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-04 16:35:28 +01:00
Deven Bansod
cbb6e3eda0 Merge branch 'QA_4_5'
Conflicts:
	po/eo.po
	po/li.po
	po/uz@latin.po
2015-12-31 12:01:10 +05:30
Madhura Jayaratne
bfcd37b84f Fix #11710 Unable to add/remove on update CURRENT_TIMESTAMP option while editing a timestamp field
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-02 17:16:50 +11:00
Deven Bansod
e2d0d2703a Include with correct filename
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-17 03:34:48 +05:30
Deven Bansod
c62672edd0 Merge branch 'QA_4_5'
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	po/cs.po
	po/fi.po
	po/it.po
	po/nb.po
	po/nl.po
	po/sv.po
2015-11-12 23:49:31 +05:30
Madhura Jayaratne
b31248fba4 Fix regression introduced while moving controllers
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-04 07:22:56 +11:00
Madhura Jayaratne
a701078e00 Move the controller to appropriate package
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-03 13:25:17 +11:00