[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 238e00: Fix #11531. Invalid SQL in table definition when e...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 238e00b5d93a7a8ead47ce197e33e746419e2890
      https://github.com/phpmyadmin/phpmyadmin/commit/238e00b5d93a7a8ead47ce197e33e746419e2890
  Author: Dan Ungureanu <udan1107 at gmail.com>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M libraries/sql-parser/src/Components/OptionsArray.php

  Log Message:
  -----------
  Fix #11531. Invalid SQL in table definition when exporting table.
Cherry-picked udan11/sql-parser at e5b1cd830d2156127ba090d0d173e344db5fcfd1.

Signed-off-by: Dan Ungureanu <udan1107 at gmail.com>


  Commit: 33f1fe5bd929ce8036f6d9c65201a595ed94a67d
      https://github.com/phpmyadmin/phpmyadmin/commit/33f1fe5bd929ce8036f6d9c65201a595ed94a67d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: b77c874db6e0abc4df2d462ff0fa4a6933b9b9d3
      https://github.com/phpmyadmin/phpmyadmin/commit/b77c874db6e0abc4df2d462ff0fa4a6933b9b9d3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ec7cc62e7106...b77c874db6e0