The branch, master has been updated via 7a3c021e854fe81494a08a9b449d8dd8db9bb919 (commit) via 38e5f642e4a8d7eda4620c95cd0586022822709e (commit) from 62c2c74583cb64239f13d9ae9f93a903da1648a3 (commit)
- Log ----------------------------------------------------------------- commit 7a3c021e854fe81494a08a9b449d8dd8db9bb919 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 11:58:13 2011 +0200
Add param types
commit 38e5f642e4a8d7eda4620c95cd0586022822709e Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 11:58:07 2011 +0200
Lowercase to not trigger todo item in jenkins
-----------------------------------------------------------------------
Summary of changes: changelog.php | 2 +- libraries/server_synchronize.lib.php | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/changelog.php b/changelog.php index 5c42e67..9892638 100644 --- a/changelog.php +++ b/changelog.php @@ -75,7 +75,7 @@ $replaces = array( => '<a href="https://sourceforge.net/support/tracker.php?aid=\\1">bug #\1</a>',
// all other 6+ digit numbers are treated as bugs - '/(?<!BUG|RFE|patch) #?([0-9]{6,})/i' + '/(?<!bug|RFE|patch) #?([0-9]{6,})/i' => ' <a href="https://sourceforge.net/support/tracker.php?aid=\\1">bug #\1</a>',
// CVE/CAN entries diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 3521d14..ffbbea7 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -67,21 +67,21 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * Otherwise that entry is placed in the $insert_array. * * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_table array containing matching table names - * @param &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table - * @param $update_array A three dimensional array passed by reference to - * contain updates required for each matching table - * @param $insert_array A three dimensional array passed by reference to - * contain inserts required for each matching table - * @param $delete_array Unused - * @param $fields_num A two dimensional array passed by reference to - * contain number of fields for each matching table - * @param $matching_table_index Index of a table from $matching_table array - * @param &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param db_link $src_link connection established with source server + * @param db_link $trg_link connection established with target server + * @param array $matching_table array containing matching table names + * @param array &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table + * @param array $update_array A three dimensional array passed by reference to + * contain updates required for each matching table + * @param array $insert_array A three dimensional array passed by reference to + * contain inserts required for each matching table + * @param array $delete_array Unused + * @param array $fields_num A two dimensional array passed by reference to + * contain number of fields for each matching table + * @param array $matching_table_index Index of a table from $matching_table array + * @param array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys)
hooks/post-receive