[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2e5bc2: Add missing relations

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2e5bc2489944a5d1532d4139df3ebbfec63d9be7
      https://github.com/phpmyadmin/phpmyadmin/commit/2e5bc2489944a5d1532d4139df3ebbfec63d9be7
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M libraries/information_schema_relations.lib.php

  Log Message:
  -----------
  Add missing relations


  Commit: 3c8e4fb0bb2f1159c6e2aa0733f3ff1e0b4ea142
      https://github.com/phpmyadmin/phpmyadmin/commit/3c8e4fb0bb2f1159c6e2aa0733f3ff1e0b4ea142
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Add missing default transformations


  Commit: a34a46c22de2739b89aa857640fa6e25d4e2b8a2
      https://github.com/phpmyadmin/phpmyadmin/commit/a34a46c22de2739b89aa857640fa6e25d4e2b8a2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M libraries/DisplayResults.class.php
    M libraries/information_schema_relations.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_0'

Conflicts:
	libraries/DisplayResults.class.php
	libraries/information_schema_relations.lib.php


  Commit: 9c7623089ddcc21294cc6757d4a6d97c718b4b44
      https://github.com/phpmyadmin/phpmyadmin/commit/9c7623089ddcc21294cc6757d4a6d97c718b4b44
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M ChangeLog
    M libraries/insert_edit.lib.php
    M tbl_get_field.php

  Log Message:
  -----------
  Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0


  Commit: 791244d70bb00cd9e053e16468ab09b8484b6625
      https://github.com/phpmyadmin/phpmyadmin/commit/791244d70bb00cd9e053e16468ab09b8484b6625
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php
    M libraries/special_schema_links.lib.php

  Log Message:
  -----------
  bug #4092 Clicking on table name in view of information_schema redirects to wrong page


  Commit: 14ceff5d54ce1029616ed8e8692a6dfef45ac503
      https://github.com/phpmyadmin/phpmyadmin/commit/14ceff5d54ce1029616ed8e8692a6dfef45ac503
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M ChangeLog
    M schema_edit.php
    M tbl_get_field.php
    M test/libraries/PMA_server_engines_test.php
    M test/libraries/PMA_server_status_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: fe0baeebb157c6469aa4b34ce8ebcc53783cde89
      https://github.com/phpmyadmin/phpmyadmin/commit/fe0baeebb157c6469aa4b34ce8ebcc53783cde89
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php
    M libraries/special_schema_links.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_0'

Conflicts:
	libraries/special_schema_links.lib.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4c0ec8563f5e...fe0baeebb157