[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7a3c15: fix bug #3966, only display 'table has no unique c...

[Dieter Adriaenssens]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7a3c15724ab86af78f2f2475cfaea0470ab0f073
      https://github.com/phpmyadmin/phpmyadmin/commit/7a3c15724ab86af78f2f2475cfaea0470ab0f073
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ChangeLog
    M sql.php

  Log Message:
  -----------
  fix bug #3966, only display 'table has no unique column' when table is defined


  Commit: c6fd32f85d65c7b295b0bc1cdd6d8fd17e411d7f
      https://github.com/phpmyadmin/phpmyadmin/commit/c6fd32f85d65c7b295b0bc1cdd6d8fd17e411d7f
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ChangeLog
    M sql.php

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

Conflicts:
	sql.php


  Commit: cf0a7b6cacec1f0d3ecd5597d56f3c23df370bc3
      https://github.com/phpmyadmin/phpmyadmin/commit/cf0a7b6cacec1f0d3ecd5597d56f3c23df370bc3
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M po/et.po
    M po/sv.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/77e488449662...cf0a7b6cacec