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

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e009217f433edcb4eca93586a8db15cc4c282bf2
      https://github.com/phpmyadmin/phpmyadmin/commit/e009217f433edcb4eca93586a8db15cc4c282bf2
  Author: Michal Čihař <michal at cihar.com>
  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ř <michal at cihar.com>


  Commit: d99c4f357d5a7568a1334bcca4a880373d8b5db9
      https://github.com/phpmyadmin/phpmyadmin/commit/d99c4f357d5a7568a1334bcca4a880373d8b5db9
  Author: Michal Čihař <michal at cihar.com>
  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/412af774ba527cfe2bfbd0570fec470e246009d6
  Author: Michal Čihař <michal at cihar.com>
  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ř <michal at cihar.com>


  Commit: 96a2e3e35adcbd3157b3c7e278c36afc56463f20
      https://github.com/phpmyadmin/phpmyadmin/commit/96a2e3e35adcbd3157b3c7e278c36afc56463f20
  Author: Michal Čihař <michal at cihar.com>
  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ř <michal at cihar.com>


  Commit: fdd6d3105d4db10a9cf158850f91f6cbacbb566f
      https://github.com/phpmyadmin/phpmyadmin/commit/fdd6d3105d4db10a9cf158850f91f6cbacbb566f
  Author: Michal Čihař <michal at cihar.com>
  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/6c712a3c1510a60339b9b7b92e67a0bd7ffbe70c
  Author: Michal Čihař <michal at cihar.com>
  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/319441274cbdcbdbfbba193cb447db00e2218cd0
  Author: Michal Čihař <michal at cihar.com>
  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ř <michal at cihar.com>


  Commit: 635f83a6345fc3b1d042dd0438ca2b3a49da8bc2
      https://github.com/phpmyadmin/phpmyadmin/commit/635f83a6345fc3b1d042dd0438ca2b3a49da8bc2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M libraries/DatabaseInterface.php

  Log Message:
  -----------
  Remove unused method

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: f42674aa0ffedf28dfeca485159ccf6d6fe310b8
      https://github.com/phpmyadmin/phpmyadmin/commit/f42674aa0ffedf28dfeca485159ccf6d6fe310b8
  Author: Michal Čihař <michal at cihar.com>
  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ř <michal at cihar.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/298efcf13964...f42674aa0ffe