[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9092a2: Merge branch 'master' of https://github.com/phpmya...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9092a264891988e433c5cf90126b3db2a69aa0e8
      https://github.com/phpmyadmin/phpmyadmin/commit/9092a264891988e433c5cf90126b3db2a69aa0e8
  Author: adamgsoc2013 <adamgsoc2013 at gmail.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/messages.php
    M libraries/DatabaseInterface.class.php
    M libraries/TableSearch.class.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/sqlparser.data.php
    M libraries/structure.lib.php
    M po/es.po
    M po/fr.po
    M po/tr.po
    M po/zh_TW.po
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    A test/libraries/PMA_server_replication_test.php
    M view_create.php

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


  Commit: ada27168269e54fff59e3217ddb52b5f9fb16eee
      https://github.com/phpmyadmin/phpmyadmin/commit/ada27168269e54fff59e3217ddb52b5f9fb16eee
  Author: adamgsoc2013 <adamgsoc2013 at gmail.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M libraries/common.inc.php
    M libraries/parse_analyze.inc.php
    M libraries/sql.lib.php
    M libraries/sqlparser.lib.php
    M sql.php

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


  Commit: 3a5e5aca586e927855c1af756cd4812c5565a7a1
      https://github.com/phpmyadmin/phpmyadmin/commit/3a5e5aca586e927855c1af756cd4812c5565a7a1
  Author: adamgsoc2013 <adamgsoc2013 at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ChangeLog
    M config.sample.inc.php
    M doc/config.rst
    M examples/config.manyhosts.inc.php
    M examples/create_tables.sql
    M examples/create_tables_drizzle.sql
    M js/server_privileges.js
    M libraries/Advisor.class.php
    M libraries/Menu.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/operations.lib.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/relation.lib.php
    M libraries/server_privileges.lib.php
    A libraries/server_status.lib.php
    A libraries/server_status_advisor.lib.php
    M libraries/sql.lib.php
    M libraries/sqlparser.lib.php
    M libraries/sysinfo.lib.php
    M po/be.po
    M po/bg.po
    M po/br.po
    M po/cs.po
    M po/de.po
    M po/el.po
    M po/fi.po
    M po/gl.po
    M po/he.po
    M po/hr.po
    M po/kk.po
    M po/lt.po
    M po/lv.po
    M po/nb.po
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/sk.po
    M po/sr at latin.po
    M po/uk.po
    M po/uz at latin.po
    M server_privileges.php
    M server_status.php
    M server_status_advisor.php
    A server_user_groups.php
    M sql.php
    M test/bootstrap-dist.php
    A test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/config/PMA_FormDisplay_test.php
    A test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
    A test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/libraries/PMA_ConfigFile_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_Form_Processing_test.php
    M test/libraries/PMA_Index_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    A test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/common/PMA_whichCrlf_test.php
    M test/libraries/core/PMA_headerLocation_test.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

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


  Commit: 5bb741c8863c2c88211e19f0f6da650c93322b89
      https://github.com/phpmyadmin/phpmyadmin/commit/5bb741c8863c2c88211e19f0f6da650c93322b89
  Author: adamgsoc2013 <adamgsoc2013 at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M libraries/sqlparser.lib.php
    M test/libraries/PMA_SQL_parser_test.php

  Log Message:
  -----------
  add test case for PMA_SQL_parser


  Commit: 3d2cfd93a9d75ed67b781f9c9018acd31e95cf18
      https://github.com/phpmyadmin/phpmyadmin/commit/3d2cfd93a9d75ed67b781f9c9018acd31e95cf18
  Author: adamgsoc2013 <adamgsoc2013 at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M js/rte.js
    M libraries/sql.lib.php
    M po/ckb.po
    A test/libraries/PMA_server_status_test.php

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


  Commit: f2cf954dd82390ac1be6af4cb0cab6537d257bcb
      https://github.com/phpmyadmin/phpmyadmin/commit/f2cf954dd82390ac1be6af4cb0cab6537d257bcb
  Author: adamgsoc2013 <adamgsoc2013 at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M test/libraries/PMA_SQL_parser_test.php

  Log Message:
  -----------
  fix redefine


  Commit: c4feb3e59b157b5a363e419f85a596e5b4fc9d5a
      https://github.com/phpmyadmin/phpmyadmin/commit/c4feb3e59b157b5a363e419f85a596e5b4fc9d5a
  Author: adamgsoc2013 <adamgsoc2013 at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M libraries/operations.lib.php
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/relation.lib.php
    M libraries/sql.lib.php
    M sql.php
    A test/classes/plugin/PMA_PluginManager_test.php
    A test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
    A test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
    A test/classes/properties/options/items/PMA_PropertyItems_test.php
    A test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
    A test/classes/properties/plugins/PMA_ImportPluginProperties_test.php

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


  Commit: 4ef0d4a9169ab3b74ac4098d32f1cfb0f19fd236
      https://github.com/phpmyadmin/phpmyadmin/commit/4ef0d4a9169ab3b74ac4098d32f1cfb0f19fd236
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M libraries/sqlparser.lib.php
    M test/libraries/PMA_SQL_parser_test.php

  Log Message:
  -----------
  Merge pull request #520 from adamgsoc2013/UT_plu_parse

add test case for PMA_SQL_parser


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/82a8c5da743e...4ef0d4a9169a