Commit Graph

14714 Commits

Author SHA1 Message Date
Marc Delisle
6d67dc258b Fixes #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-16 08:09:08 -04:00
Dan Ungureanu
f499e9a9b7 Fixed class name.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-09-15 22:44:07 +03:00
Marc Delisle
e3ff4592a0 Merge branch 'MAINT_4_5_0' into QA_4_5 2015-09-14 10:49:52 -04:00
Remi Collet
41858689dd allow to use system udan11/sql-parser
Signed-off-by: Remi Collet <fedora@famillecollet.com>
2015-09-14 10:47:37 -04:00
Marc Delisle
e6c7f66b0e Fixes #11480 Notice Undefined index: drop_database
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-14 08:16:38 -04:00
Michal Čihař
9edddbf598 Avoid failure if allowdeny rules are not set
Fixes #11478

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-09-14 10:34:58 +02:00
Marc Delisle
efb71af6f4 Fix error report #14326
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-12 06:51:51 -04:00
Madhura Jayaratne
b333793375 Merge branch 'QA_4_4' into QA_4_5 2015-09-10 00:53:15 +10:00
Madhura Jayaratne
0bc6f30f5d Change value for lower_case_table_names
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:47:30 +10:00
Madhura Jayaratne
ef5177f555 Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:43:26 +10:00
Madhura Jayaratne
9131b59936 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:34:47 +10:00
Madhura Jayaratne
dbf9ff2723 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 00:31:52 +10:00
Marc Delisle
7ab576930b 4.5.0-rc1
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-09 06:03:45 -04:00
Marc Delisle
fe1d3ce9ba 4.5.1-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-09 05:08:59 -04:00
Marc Delisle
f447cd94b0 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-08 11:35:05 -04:00
Marc Delisle
f8739dc3e3 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-08 11:20:30 -04:00
Madhura Jayaratne
785f4e2711 Fix reCaptcha bypass
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-08 07:13:24 +10:00
Dan Ungureanu
4607c709ac Fixes #11465.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-09-07 19:50:07 +03:00
Marc Delisle
c69cc95a6c Typo in variable name
See 01e7c65f07

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-05 12:27:12 -04:00
Marc Delisle
a2898d760e Fixes #11463 Cannot redeclare class phpseclib\Crypt\AES
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-05 12:20:09 -04:00
Marc Delisle
ff358717e4 Fix invalid argument supplied for foreach()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-05 05:43:21 -04:00
Marc Delisle
ec4a023b49 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-04 07:53:44 -04:00
Marc Delisle
fdd26da4bf Merge pull request #11459 from madhuracj/issue11457
Fix #11457 414 Request-URI Too Large
2015-09-04 07:45:14 -04:00
Madhura Jayaratne
5998c1de53 Fix #11457 414 Request-URI Too Large
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-04 09:52:27 +10:00
Dmitry Bakshaev
7b594270a1 cookie authentication: fix cookie_iv length detection with mb_string overload
Signed-off-by: Dmitry Bakshaev <dab1818@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-03 09:40:25 -04:00
Madhura Jayaratne
ae92e02dbf Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-03 14:59:27 +10:00
Madhura Jayaratne
06e0773d94 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-09-03 09:54:41 +10:00
Madhura Jayaratne
b48c414c0b Fix bugs introduced in 788c96e8c7 while fixing issue #11442
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-03 09:53:34 +10:00
Marc Delisle
e1b916b223 4.5.0-beta2 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-02 16:54:17 -04:00
Dmitry Bakshaev
c1495982ab cookie authentication: fix cookie_iv length detection with mb_string overload
Signed-off-by: Dmitry Bakshaev <dab1818@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-02 11:35:45 -04:00
Madhura Jayaratne
5916f3b8da Fix #11454 Find and replace is broken
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-02 22:58:58 +10:00
Marc Delisle
85f6849921 Avoid fetching a variable that was only introduced in MySQL 5.7.2
Fix a notice due to the new way of fetching system variables

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-02 08:05:24 -04:00
Marc Delisle
2bf07ffac6 Merge pull request #11449 from devenbansod/fix_refactor_add_copy_user
Refactor queries fn and fix errors related to add/copy user
2015-09-01 12:07:07 -04:00
Deven Bansod
529b9ff4c8 Refactor queries fn and fix errors related to add/copy user
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-09-02 00:34:08 +05:30
Marc Delisle
f3eb388854 Fixes #11448 Clarify doc about the MemoryLimit directive
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-31 16:55:03 -04:00
Madhura Jayaratne
53bbff7311 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-08-31 22:44:32 +10:00
Marc Delisle
c7342b7ffd Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-31 08:37:58 -04:00
Marc Delisle
9642af4ed5 Fixes #11447 MySQL 5.5 and the language system variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-31 08:32:50 -04:00
Madhura Jayaratne
3c118b8106 Fix #11446 MySQL 5.7 and Variables page for an unprivileged user
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-31 22:28:03 +10:00
Madhura Jayaratne
d3e8dac98c Fix #11445 MySQL 5.7 and Status page for an unprivileged user
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-31 21:23:51 +10:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-31 17:10:32 +10:00
Marc Delisle
993134cacd Missing column comments in table Structure
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-30 08:43:44 -04:00
Madhura Jayaratne
ab00a2af65 Add missing 'sql_create_database' to setup and user preferences. Organize export relation options
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-29 17:24:30 +10:00
Marc Delisle
c6a3671e6c Fixes #11434 Class 'SqlParser\Lexer' not found
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-28 08:19:40 -04:00
Madhura Jayaratne
0753fb86d0 Merge pull request #11441 from madhuracj/issue11436
Fix #11436 CREATE DATABASE should be enabled by default on server exports
2015-08-28 20:30:20 +10:00
Madhura Jayaratne
2c4ef3888d Fix bug - Do not export sys database when exporting server
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-28 19:44:33 +10:00
Madhura Jayaratne
154d62d27d Fix #11436 CREATE DATABASE should be enabled by default on server exports
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-28 18:52:37 +10:00
Deven Bansod
e75d5f1145 Fix #11433
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-08-27 18:12:36 +05:30
Madhura Jayaratne
88710c5312 Fix #11434 Class 'SqlParser\Lexer' not found
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-27 13:07:29 +10:00
Atul Pratap Singh
d8d02fabc9 Remove not required lines
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-08-26 18:09:45 +05:30