[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 171a33: Merge branch 'master' of https://github.com/phpmya... - Git

9 Aug 2013


      Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 171a33aef61cdb808addb4b063a67b8d70128cc0
      https://github.com/phpmyadmin/phpmyadmin/commit/171a33aef61cdb808addb4b063a6...
  Author: adamgsoc2013 adamgsoc2013@gmail.com
  Date:   2013-08-08 (Thu, 08 Aug 2013)
Changed paths:
    M ChangeLog
    M PMAStandard/Sniffs/Files/LineLengthSniff.php
    M browse_foreigners.php
    M db_create.php
    M db_datadict.php
    M db_export.php
    M db_import.php
    M db_operations.php
    M db_printview.php
    M db_qbe.php
    M db_sql.php
    M db_structure.php
    M db_tracking.php
    M doc/config.rst
    M export.php
    M gis_data_editor.php
    M import.php
    M index.php
    M js/codemirror/lib/codemirror.js
    M js/codemirror/mode/sql/sql.js
    A js/doclinks.js
    M js/functions.js
    M js/messages.php
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/PDF.class.php
    M libraries/RecentTable.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Theme.class.php
    M libraries/Theme_Manager.class.php
    M libraries/Tracker.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/Validator.class.php
    M libraries/config/config_functions.lib.php
    M libraries/core.lib.php
    M libraries/data_dictionary_relations.lib.php
    M libraries/db_common.inc.php
    M libraries/db_info.inc.php
    M libraries/db_table_exists.lib.php
    M libraries/dbi/DBIDrizzle.class.php
    M libraries/display_change_password.lib.php
    M libraries/display_create_database.lib.php
    M libraries/display_create_table.lib.php
    M libraries/display_export.lib.php
    M libraries/display_import.lib.php
    M libraries/display_indexes.lib.php
    M libraries/display_select_lang.lib.php
    M libraries/display_structure.lib.php
    M libraries/engines/innobase.lib.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/index.lib.php
    M libraries/information_schema_relations.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mysql_charsets.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/operations.lib.php
    M libraries/phpseclib/Crypt/AES.php
    M libraries/phpseclib/Crypt/Rijndael.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/select_server.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_common.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_engines.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_queries.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_variables.lib.php
    M libraries/special_schema_links.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.data.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M libraries/user_preferences.lib.php
    M pmd_general.php
    M pmd_pdf.php
    M pmd_relation_new.php
    M pmd_relation_upd.php
    M pmd_save_pos.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be@latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.po
    M po/ko.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr@latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz@latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M prefs_forms.php
    M prefs_manage.php
    M querywindow.php
    M schema_edit.php
    M schema_export.php
    M scripts/generate-sprites
    M server_collations.php
    M server_databases.php
    M server_import.php
    M server_privileges.php
    M server_sql.php
    M server_variables.php
    M setup/frames/config.inc.php
    M setup/frames/index.inc.php
    M setup/frames/menu.inc.php
    M setup/lib/form_processing.lib.php
    M setup/lib/index.lib.php
    M setup/validate.php
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_export.php
    M tbl_find_replace.php
    M tbl_import.php
    M tbl_move_copy.php
    M tbl_operations.php
    M tbl_printview.php
    M tbl_relation.php
    M tbl_row_action.php
    M tbl_select.php
    M tbl_sql.php
    M tbl_structure.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Advisor_test.php
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DBQbe_test.php
    M test/classes/PMA_DbSearch_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_File_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_Message_test.php
    M test/classes/PMA_PDF_test.php
    M test/classes/PMA_Scripts_test.php
    M test/classes/PMA_TableReplaceSearch_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/classes/PMA_Theme_test.php
    M test/classes/PMA_Types_Drizzle_test.php
    M test/classes/PMA_Util_test.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/gis/PMA_GIS_Geometrycollection_test.php
    M test/classes/gis/PMA_GIS_Linestring_test.php
    M test/classes/gis/PMA_GIS_Multilinestring_test.php
    M test/classes/gis/PMA_GIS_Multipoint_test.php
    M test/classes/gis/PMA_GIS_Multipolygon_test.php
    M test/classes/gis/PMA_GIS_Point_test.php
    M test/classes/gis/PMA_GIS_Polygon_test.php
    M test/classes/navigation/PMA_NodeFactory_test.php
    M test/classes/navigation/PMA_Node_Column_Container_test.php
    M test/classes/navigation/PMA_Node_Column_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/export/PMA_ExportOds_test.php
    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
    M test/libraries/PMA_SQL_parse_analyze_test.php
    M test/libraries/PMA_SQL_parser_data_test.php
    M test/libraries/PMA_SQL_parser_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_generateCommonUrl_test.php
    M test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_collations_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_engines_test.php
    M test/libraries/PMA_server_plugins_test.php
    M test/libraries/PMA_server_replication_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php
    M test/libraries/PMA_server_user_groups_test.php
    M test/libraries/PMA_server_variables_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/common/PMA_formatSql_test.php
    M test/libraries/core/PMA_headerLocation_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
    M test/theme.php
    M themes/original/css/common.css.php
    M themes/original/img/sprites.png
    M themes/original/layout.inc.php
    M themes/original/sprites.lib.php
    M themes/pmahomme/css/codemirror.css.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/layout.inc.php
    M themes/pmahomme/sprites.lib.php
    M themes/svg_gradient.php
    M transformation_wrapper.php
    M user_password.php
    M view_create.php
    M view_operations.php
Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into ut_plu_dbi
Commit: 46ad9b281a62e5e2a6dcd3b00e8d3ab45ac9dc5a
      https://github.com/phpmyadmin/phpmyadmin/commit/46ad9b281a62e5e2a6dcd3b00e8d...
  Author: adamgsoc2013 adamgsoc2013@gmail.com
  Date:   2013-08-08 (Thu, 08 Aug 2013)
Changed paths:
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M po/fi.po
Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into ut_plu_dbi
Commit: bd7eefc39bbe5ad176082b90f45752002dd51335
      https://github.com/phpmyadmin/phpmyadmin/commit/bd7eefc39bbe5ad176082b90f457...
  Author: adamgsoc2013 adamgsoc2013@gmail.com
  Date:   2013-08-08 (Thu, 08 Aug 2013)
Changed paths:
    M test/classes/PMA_Table_test.php
    M test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_relation_test.php
Log Message:
  -----------
  add more test cases
Commit: 2a3d5c608ae1b7cf5a3b7ffd8c048946d3a89df8
      https://github.com/phpmyadmin/phpmyadmin/commit/2a3d5c608ae1b7cf5a3b7ffd8c04...
  Author: Michal Čihař michal@cihar.com
  Date:   2013-08-08 (Thu, 08 Aug 2013)
Changed paths:
    M test/classes/PMA_Table_test.php
    M test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_relation_test.php
Log Message:
  -----------
  Merge pull request #576 from adamgsoc2013/ut_plu_dbi
add more test cases
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a766b7d1a349...2a3d5c608ae1