[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e00921: Fix check for system schema

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e009217f433edcb4eca93586a8db15cc4c282bf2 https://github.com/phpmyadmin/phpmyadmin/commit/e009217f433edcb4eca93586a8d… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/controllers/database/DatabaseStructureController.php Log Message: ----------- Fix check for system schema Signed-off-by: Michal Čihař &lt;michal(a)cihar.com&gt; Commit: d99c4f357d5a7568a1334bcca4a880373d8b5db9 https://github.com/phpmyadmin/phpmyadmin/commit/d99c4f357d5a7568a1334bcca4a… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/controllers/database/DatabaseStructureController.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 412af774ba527cfe2bfbd0570fec470e246009d6 https://github.com/phpmyadmin/phpmyadmin/commit/412af774ba527cfe2bfbd0570fe… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/controllers/database/DatabaseStructureController.php Log Message: ----------- Avoid using superglobal Signed-off-by: Michal Čihař &lt;michal(a)cihar.com&gt; Commit: 96a2e3e35adcbd3157b3c7e278c36afc56463f20 https://github.com/phpmyadmin/phpmyadmin/commit/96a2e3e35adcbd3157b3c7e278c… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/controllers/database/DatabaseStructureController.php Log Message: ----------- Avoid using globals for things we have as class attribute Signed-off-by: Michal Čihař &lt;michal(a)cihar.com&gt; Commit: fdd6d3105d4db10a9cf158850f91f6cbacbb566f https://github.com/phpmyadmin/phpmyadmin/commit/fdd6d3105d4db10a9cf158850f9… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/controllers/database/DatabaseStructureController.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 6c712a3c1510a60339b9b7b92e67a0bd7ffbe70c https://github.com/phpmyadmin/phpmyadmin/commit/6c712a3c1510a60339b9b7b92e6… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Revert "Remove compatibility code with MySQL < 5.0" This is still needed Fixes #12161 This reverts commit edd264c91f3aeb278657a5a0535a6d6dce7c4363. Commit: 319441274cbdcbdbfbba193cb447db00e2218cd0 https://github.com/phpmyadmin/phpmyadmin/commit/319441274cbdcbdbfbba193cb44… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/Util.php Log Message: ----------- Share code for getting table status This way it correctly respects DisableIS setting. Signed-off-by: Michal Čihař &lt;michal(a)cihar.com&gt; Commit: 635f83a6345fc3b1d042dd0438ca2b3a49da8bc2 https://github.com/phpmyadmin/phpmyadmin/commit/635f83a6345fc3b1d042dd0438c… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Remove unused method Signed-off-by: Michal Čihař &lt;michal(a)cihar.com&gt; Commit: f42674aa0ffedf28dfeca485159ccf6d6fe310b8 https://github.com/phpmyadmin/phpmyadmin/commit/f42674aa0ffedf28dfeca485159… Author: Michal Čihař &lt;michal(a)cihar.com&gt; Date: 2016-04-06 (Wed, 06 Apr 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Better document why these aliases are needed It's no longer for MySQL forward compatibility, but rather for possibility to switch between SHOW TABLES and INFORMATION_SCHEMA using DisableIS directive. Signed-off-by: Michal Čihař &lt;michal(a)cihar.com&gt; Compare: https://github.com/phpmyadmin/phpmyadmin/compare/298efcf13964...f42674aa0ffe