[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ace1fa: Fixed parsing of field definition

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ace1faa08515e4f8305222079a20adf33bd04b36
      https://github.com/phpmyadmin/phpmyadmin/commit/ace1faa08515e4f8305222079a20adf33bd04b36
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  -----------
  Fixed parsing of field definition

Fixes #12083

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


  Commit: 590593c8056b8d6b4f09ebe92a2c628289e445cd
      https://github.com/phpmyadmin/phpmyadmin/commit/590593c8056b8d6b4f09ebe92a2c628289e445cd
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8b87d14fe8dd...590593c8056b