[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3d1157: Changed the mysql reserved words conflicting colum...

[Isaac Bennetch]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3d1157c944b75d427e48475ffa2b94d95aa1b2bc
      https://github.com/phpmyadmin/phpmyadmin/commit/3d1157c944b75d427e48475ffa2b94d95aa1b2bc
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M db_designer.php
    M libraries/db_designer.lib.php
    M sql/create_tables.sql
    M sql/create_tables_drizzle.sql

  Log Message:
  -----------
  Changed the mysql reserved words conflicting column names

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 0211920790340d51ba17b142ec9b672534934087
      https://github.com/phpmyadmin/phpmyadmin/commit/0211920790340d51ba17b142ec9b672534934087
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M db_designer.php
    M libraries/db_designer.lib.php
    M sql/create_tables.sql
    M sql/create_tables_drizzle.sql

  Log Message:
  -----------
  Merge pull request #1759 from devenbansod/1060C

Changed the mysql reserved words conflicting column names in Designer settings


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dd7230cc2098...021192079034