gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-04-29 18:34:36 +05:30
commit c38f5a82c6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mult_submits.lib.php
View File

@ -409,7 +409,7 @@ function PMA_getHtmlForAddPrefixTable($action, $_url_params)
* @param string $what mult_submit type
* @param string $action action type
* @param array $_url_params URL params
* @param array $full_query full sql query string
* @param string $full_query full sql query string
*
* @return string
*/

5
test/libraries/PMA_mult_submits_test.php
View File

@ -284,7 +284,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
list(
$result, $rebuild_database_list, $reload_ret,
$run_parts, $use_sql, $sql_query, $sql_query_views
$run_parts, $use_sql,,
) = PMA_getQueryStrFromSelected(
$query_type, $selected, $db, $table, $views,
$primary, $from_prefix, $to_prefix
@ -316,8 +316,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
$query_type = 'analyze_tbl';
list(
$result, $rebuild_database_list, $reload_ret,
$run_parts, $use_sql, $sql_query, $sql_query_views
,,,, $use_sql,,
) = PMA_getQueryStrFromSelected(
$query_type, $selected, $db, $table, $views,
$primary, $from_prefix, $to_prefix