Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

This commit is contained in:
Marc Delisle 2013-11-27 13:09:04 -05:00
commit 4ccf98d58c

View File

@ -1950,11 +1950,11 @@ function PMA_buildSqlQuery($is_insertignore, $query_fields, $value_sets)
/**
* Executes the sql query and get the result, then move back to the calling page
*
* @param array $url_params url parameters array
* @param array $query built query from PMA_buildSqlQuery()
* @param array $url_params url parameters array
* @param array $query built query from PMA_buildSqlQuery()
*
* @return array $url_params, $total_affected_rows, $last_messages
* $warning_messages, $error_messages, $return_to_sql_query
* @return array $url_params, $total_affected_rows, $last_messages
* $warning_messages, $error_messages, $return_to_sql_query
*/
function PMA_executeSqlQuery($url_params, $query)
{