[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ff688b: Bug-4448: Dump binary columns in hexadecimal notat...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ff688b18fb4083c6c18043f207c0f6015a54d0f4
      https://github.com/phpmyadmin/phpmyadmin/commit/ff688b18fb4083c6c18043f207c0f6015a54d0f4
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog
    M export.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/plugins/export/ExportSql.class.php
    M test/classes/plugin/export/PMA_ExportSql_test.php

  Log Message:
  -----------
  Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 478a105ed6eb69d00d11a3961c6fc8b1eee1b946
      https://github.com/phpmyadmin/phpmyadmin/commit/478a105ed6eb69d00d11a3961c6fc8b1eee1b946
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog
    M export.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/plugins/export/ExportSql.class.php
    M test/classes/plugin/export/PMA_ExportSql_test.php

  Log Message:
  -----------
  Merge pull request #1218 from D-storm/bug-4448

Bug-4448: Dump binary columns in hexadecimal notation not working


  Commit: a83ca5d73b89915790a5c8ccd8b2e77997c228bb
      https://github.com/phpmyadmin/phpmyadmin/commit/a83ca5d73b89915790a5c8ccd8b2e77997c228bb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ChangeLog
    M export.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/plugins/export/ExportSql.class.php
    M test/classes/plugin/export/PMA_ExportSql_test.php

  Log Message:
  -----------
  Fix merge conflict

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


  Commit: 44cc200650734ab5d3a8d7e400b8b6a307c8698a
      https://github.com/phpmyadmin/phpmyadmin/commit/44cc200650734ab5d3a8d7e400b8b6a307c8698a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Log Message:
  -----------
  Merge commit '478a105'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c498065b1ab1...44cc20065073