[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 71d6a6: Bug - correctly set lock_table directive when repo...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 71d6a654e2c7ec59e679caf80dd6e053b68ac49c
      https://github.com/phpmyadmin/phpmyadmin/commit/71d6a654e2c7ec59e679caf80dd6e053b68ac49c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Bug - correctly set lock_table directive when repopulating on back button click

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 69fd08be9c57a1a8264a3f13f24c49733df28aa5
      https://github.com/phpmyadmin/phpmyadmin/commit/69fd08be9c57a1a8264a3f13f24c49733df28aa5
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    M ChangeLog
    M db_operations.php
    M db_routines.php
    M doc/faq.rst
    M js/console.js
    M libraries/check_user_privileges.lib.php
    M libraries/config/FormDisplay.class.php
    A libraries/controllers/Controller.class.php
    A libraries/controllers/TableChartController.class.php
    A libraries/controllers/TableController.class.php
    A libraries/controllers/TableGisVisualizationController.class.php
    A libraries/controllers/TableIndexesController.class.php
    A libraries/controllers/TableRelationController.class.php
    M libraries/database_interface.inc.php
    M libraries/dbi/DBIDummy.class.php
    A libraries/di/AliasItem.class.php
    A libraries/di/Container.class.php
    A libraries/di/FactoryItem.class.php
    A libraries/di/Item.int.php
    A libraries/di/ReflectorItem.class.php
    A libraries/di/ServiceItem.class.php
    A libraries/di/ValueItem.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/operations.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_privileges.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    A libraries/util.lib.php
    M po/nl.po
    M tbl_chart.php
    M tbl_gis_visualization.php
    M tbl_indexes.php
    M tbl_operations.php
    M tbl_relation.php
    M tbl_structure.php
    M templates/columns_definitions/column_adjust_privileges.phtml
    M templates/columns_definitions/column_attributes.phtml

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5bb0b3dcf3b1...69fd08be9c57