- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-219-g87dd6b3
by Marc Delisle 12 Mar '10

12 Mar '10

The branch, master has been updated via 87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b (commit) via 7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d (commit) from c4bdb187033c908982e814af1b254d28ab3b1d3e (commit) - Log ----------------------------------------------------------------- commit 87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b Merge: c4bdb187033c908982e814af1b254d28ab3b1d3e 7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Mar 12 17:16:58 2010 -0500 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ db_operations.php | 2 +- db_printview.php | 2 +- db_structure.php | 6 +++++- export.php | 7 +++---- libraries/Table.class.php | 32 ++++++++++++++++++++++++++++++-- libraries/display_export.lib.php | 5 +---- tbl_printview.php | 7 +++---- tbl_structure.php | 7 +++---- 9 files changed, 49 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index dad74c5..24103f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Uzbek update, thanks to Orzu Samarqandiy 3.3.2.0 (not yet released) +- patch #2969449 [core] Name for MERGE engine varies depending on the + MySQL version, thanks to Dieter Adriaenssens - ruleant 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/db_operations.php b/db_operations.php index bcee977..c09e2e1 100644 --- a/db_operations.php +++ b/db_operations.php @@ -110,7 +110,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // do not copy the data from a Merge table // note: on the calling FORM, 'data' means 'structure and data' - if ($tables_full[$each_table]['Engine'] == 'MRG_MyISAM') { + if (PMA_Table::isMerge($db, $each_table)) { if ($this_what == 'data') { $this_what = 'structure'; } diff --git a/db_printview.php b/db_printview.php index 277566d..e7c0547 100644 --- a/db_printview.php +++ b/db_printview.php @@ -117,7 +117,7 @@ else { $sum_entries = $sum_size = 0; $odd_row = true; foreach ($tables as $sts_data) { - if (strtoupper($sts_data['ENGINE']) == 'MRG_MYISAM' + if (PMA_Table::isMerge($db, $sts_data['TABLE_NAME']) || strtoupper($sts_data['ENGINE']) == 'FEDERATED') { $merged_size = true; } else { diff --git a/db_structure.php b/db_structure.php index c0df159..1d92330 100644 --- a/db_structure.php +++ b/db_structure.php @@ -225,7 +225,11 @@ foreach ($tables as $keyname => $each_table) { } //$display_rows = ' - '; break; + // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM + // Both are aliases for MERGE + case 'MRG_MyISAM' : case 'MRG_MYISAM' : + case 'MERGE' : case 'BerkeleyDB' : // Merge or BerkleyDB table: Only row count is accurate. if ($is_show_stats) { @@ -254,7 +258,7 @@ foreach ($tables as $keyname => $each_table) { } } // end switch - if ('MRG_MYISAM' != $each_table['ENGINE']) { + if (! PMA_Table::isMerge($db, $each_table['TABLE_NAME'])) { $sum_entries += $each_table['TABLE_ROWS']; } diff --git a/export.php b/export.php index 1f7b39e..5399d43 100644 --- a/export.php +++ b/export.php @@ -439,7 +439,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($current_db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($current_db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { break 3; @@ -488,7 +488,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { break 2; @@ -537,8 +537,7 @@ if ($export_type == 'server') { // If this is an export of a single view, we have to export data; // for example, a PDF report // if it is a merge table, no data is exported - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (isset($GLOBALS[$what . '_data']) && ! $is_merge) { + if (isset($GLOBALS[$what . '_data']) && ! PMA_Table::isMerge($db, $table)) { if (!empty($sql_query)) { // only preg_replace if needed if (!empty($add_query)) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index b2b6963..25e3709 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -238,6 +238,31 @@ class PMA_Table return $type == 'VIEW'; } + /** + * Checks if this is a merge table + * + * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. + * + * @param string the database name + * @param string the table name + * @return boolean true if it is a merge table + * @access public + */ + public function isMerge($db = null, $table = null) + { + // if called static, with parameters + if (! empty($db) && ! empty($table)) { + $engine = PMA_Table::sGetStatusInfo($db, $table, 'ENGINE', null, true); + } + // if called as an object + // does not work yet, because $this->settings[] is not filled correctly + else if (! empty($this)) { + $engine = $this->get('ENGINE'); + } + + return (! empty($engine) && ((strtoupper($engine) == 'MERGE') || (strtoupper($engine) == 'MRG_MYISAM'))); + } + static public function sGetToolTip($db, $table) { return PMA_Table::sGetStatusInfo($db, $table, 'Comment') @@ -254,9 +279,10 @@ class PMA_Table * @param string $table * @param string $info * @param boolean $force_read + * @param boolean if true, disables error message * @return mixed */ - static public function sGetStatusInfo($db, $table, $info = null, $force_read = false) + static public function sGetStatusInfo($db, $table, $info = null, $force_read = false, $disable_error = false) { if (! isset(PMA_Table::$cache[$db][$table]) || $force_read) { PMA_DBI_get_tables_full($db, $table); @@ -274,7 +300,9 @@ class PMA_Table } if (! isset(PMA_Table::$cache[$db][$table][$info])) { - trigger_error('unknown table status: ' . $info, E_USER_WARNING); + if (! $disable_error) { + trigger_error('unknown table status: ' . $info, E_USER_WARNING); + } return false; } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index a680995..186b0d3 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -104,10 +104,7 @@ echo PMA_pluginGetJavascript($export_list); //]]> </script> -<?php - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (strlen($table) && ! isset($num_tables) && ! $is_merge) { -?> +<?php if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) { ?> <div class="formelementrow"> <?php echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; diff --git a/tbl_printview.php b/tbl_printview.php index c43efd9..3cd2868 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -278,10 +278,9 @@ foreach ($the_tables as $key => $table) { } if ($nonisam == false) { // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($db, $table); + list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']); if ($mergetable == false) { list($index_size, $index_unit) = PMA_formatByteDown($showtable['Index_length']); diff --git a/tbl_structure.php b/tbl_structure.php index 4be5767..51b001e 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -625,10 +625,9 @@ if ($cfg['ShowStats']) { } // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($GLOBALS['db'], $GLOBALS['table']); + // this is to display for example 261.2 MiB instead of 268k KiB $max_digits = 5; $decimals = 1; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-53-g7c818d0
by Marc Delisle 12 Mar '10

12 Mar '10

The branch, QA_3_3 has been updated via 7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d (commit) from 4a53eb19160936770d32244939ee82906e0f88c8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ db_operations.php | 2 +- db_printview.php | 2 +- db_structure.php | 6 +++++- export.php | 7 +++---- libraries/Table.class.php | 32 ++++++++++++++++++++++++++++++-- libraries/display_export.lib.php | 5 +---- tbl_printview.php | 7 +++---- tbl_structure.php | 7 +++---- 9 files changed, 49 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index f120b5a..26f8b70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ 3.3.2.0 (not yet released) +- patch #2969449 [core] Name for MERGE engine varies depending on the + MySQL version, thanks to Dieter Adriaenssens - ruleant 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/db_operations.php b/db_operations.php index 624007e..f051877 100644 --- a/db_operations.php +++ b/db_operations.php @@ -110,7 +110,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // do not copy the data from a Merge table // note: on the calling FORM, 'data' means 'structure and data' - if ($tables_full[$each_table]['Engine'] == 'MRG_MyISAM') { + if (PMA_Table::isMerge($db, $each_table)) { if ($this_what == 'data') { $this_what = 'structure'; } diff --git a/db_printview.php b/db_printview.php index bf51015..d656f0e 100644 --- a/db_printview.php +++ b/db_printview.php @@ -117,7 +117,7 @@ else { $sum_entries = $sum_size = 0; $odd_row = true; foreach ($tables as $sts_data) { - if (strtoupper($sts_data['ENGINE']) == 'MRG_MYISAM' + if (PMA_Table::isMerge($db, $sts_data['TABLE_NAME']) || strtoupper($sts_data['ENGINE']) == 'FEDERATED') { $merged_size = true; } else { diff --git a/db_structure.php b/db_structure.php index fa18390..845ffd3 100644 --- a/db_structure.php +++ b/db_structure.php @@ -226,7 +226,11 @@ foreach ($tables as $keyname => $each_table) { } //$display_rows = ' - '; break; + // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM + // Both are aliases for MERGE + case 'MRG_MyISAM' : case 'MRG_MYISAM' : + case 'MERGE' : case 'BerkeleyDB' : // Merge or BerkleyDB table: Only row count is accurate. if ($is_show_stats) { @@ -255,7 +259,7 @@ foreach ($tables as $keyname => $each_table) { } } // end switch - if ('MRG_MYISAM' != $each_table['ENGINE']) { + if (! PMA_Table::isMerge($db, $each_table['TABLE_NAME'])) { $sum_entries += $each_table['TABLE_ROWS']; } diff --git a/export.php b/export.php index f8c9914..dae4cf4 100644 --- a/export.php +++ b/export.php @@ -439,7 +439,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($current_db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($current_db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { break 3; @@ -488,7 +488,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { break 2; @@ -537,8 +537,7 @@ if ($export_type == 'server') { // If this is an export of a single view, we have to export data; // for example, a PDF report // if it is a merge table, no data is exported - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (isset($GLOBALS[$what . '_data']) && ! $is_merge) { + if (isset($GLOBALS[$what . '_data']) && ! PMA_Table::isMerge($db, $table)) { if (!empty($sql_query)) { // only preg_replace if needed if (!empty($add_query)) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 0f407e7..de2cfe2 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -238,6 +238,31 @@ class PMA_Table return $type == 'VIEW'; } + /** + * Checks if this is a merge table + * + * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. + * + * @param string the database name + * @param string the table name + * @return boolean true if it is a merge table + * @access public + */ + public function isMerge($db = null, $table = null) + { + // if called static, with parameters + if (! empty($db) && ! empty($table)) { + $engine = PMA_Table::sGetStatusInfo($db, $table, 'ENGINE', null, true); + } + // if called as an object + // does not work yet, because $this->settings[] is not filled correctly + else if (! empty($this)) { + $engine = $this->get('ENGINE'); + } + + return (! empty($engine) && ((strtoupper($engine) == 'MERGE') || (strtoupper($engine) == 'MRG_MYISAM'))); + } + static public function sGetToolTip($db, $table) { return PMA_Table::sGetStatusInfo($db, $table, 'Comment') @@ -254,9 +279,10 @@ class PMA_Table * @param string $table * @param string $info * @param boolean $force_read + * @param boolean if true, disables error message * @return mixed */ - static public function sGetStatusInfo($db, $table, $info = null, $force_read = false) + static public function sGetStatusInfo($db, $table, $info = null, $force_read = false, $disable_error = false) { if (! isset(PMA_Table::$cache[$db][$table]) || $force_read) { PMA_DBI_get_tables_full($db, $table); @@ -274,7 +300,9 @@ class PMA_Table } if (! isset(PMA_Table::$cache[$db][$table][$info])) { - trigger_error('unknown table status: ' . $info, E_USER_WARNING); + if (! $disable_error) { + trigger_error('unknown table status: ' . $info, E_USER_WARNING); + } return false; } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index a680995..186b0d3 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -104,10 +104,7 @@ echo PMA_pluginGetJavascript($export_list); //]]> </script> -<?php - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (strlen($table) && ! isset($num_tables) && ! $is_merge) { -?> +<?php if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) { ?> <div class="formelementrow"> <?php echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; diff --git a/tbl_printview.php b/tbl_printview.php index 949a78a..c5b17ab 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -279,10 +279,9 @@ foreach ($the_tables as $key => $table) { } if ($nonisam == false) { // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($db, $table); + list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']); if ($mergetable == false) { list($index_size, $index_unit) = PMA_formatByteDown($showtable['Index_length']); diff --git a/tbl_structure.php b/tbl_structure.php index 750fbdc..0d966cc 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -612,10 +612,9 @@ if ($cfg['ShowStats']) { } // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($GLOBALS['db'], $GLOBALS['table']); + // this is to display for example 261.2 MiB instead of 268k KiB $max_digits = 5; $decimals = 1; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-217-gc4bdb18
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, master has been updated via c4bdb187033c908982e814af1b254d28ab3b1d3e (commit) via 105c33fe34136245ba47e36660000c882adc4052 (commit) from bbc3d3debfc3ae86aaab661a536170293c7c9cf7 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 9023b96..269ef44 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -93,6 +93,7 @@ fi LC_ALL=C date -u > RELEASE-DATE-${version} # Building Documentation.txt +echo "* Generating Documentation.txt" LC_ALL=C w3m -dump Documentation.html > Documentation.txt # Remove test directory from package to avoid Path disclosure messages @@ -119,28 +120,28 @@ for kit in $KITS ; do for comp in $COMPRESSIONS ; do case $comp in tbz|tgz) - echo "Creating $name.tar" + echo "* Creating $name.tar" tar cf $name.tar $name if [ $comp = tbz ] ; then - echo "Creating $name.tar.bz2" + echo "* Creating $name.tar.bz2" bzip2 -9k $name.tar fi if [ $comp = tgz ] ; then - echo "Creating $name.tar.gz" + echo "* Creating $name.tar.gz" gzip -9c $name.tar > $name.tar.gz fi rm $name.tar ;; zip) - echo "Creating $name.zip" + echo "* Creating $name.zip" zip -q -9 -r $name.zip $name ;; zip-7z) - echo "Creating $name.zip" + echo "* Creating $name.zip" 7za a -bd -tzip $name.zip $name > /dev/null ;; 7z) - echo "Creating $name.7z" + echo "* Creating $name.7z" 7za a -bd $name.7z $name > /dev/null ;; *) @@ -178,6 +179,14 @@ if [ $# -gt 0 ] ; then tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -` echo "* Tagging release as $tagname" git tag -a -m "Released $version" $tagname $branch + if echo $version | grep '[a-z_-]' ; then + echo "* Tagging release as TESTING" + git tag -a -f -m "Released $version" TESTING $branch + else + echo "* Tagging release as STABLE" + git tag -a -f -m "Released $version" STABLE $branch + fi + echo " Dont forget to push tags using: git push --tags" ;; *) echo "Unknown parameter: $1!" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-395-g4862806
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, gettext has been updated via 486280626a298d3126e97f32b130b0e8895177a6 (commit) via ba106a107a958f19003c2e83dfc72f297279e460 (commit) via 2efb431b5ce2b80f77db7b3ee4b714f5b9de0f65 (commit) via c4bdb187033c908982e814af1b254d28ab3b1d3e (commit) via 105c33fe34136245ba47e36660000c882adc4052 (commit) from 4606ddf16f1c7c6247134e3b1ceafe4204b7d335 (commit) - Log ----------------------------------------------------------------- commit 486280626a298d3126e97f32b130b0e8895177a6 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 14:00:11 2010 +0100 Adjus languages cleanup for gettext. commit ba106a107a958f19003c2e83dfc72f297279e460 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 13:50:07 2010 +0100 Message for generating mo files. commit 2efb431b5ce2b80f77db7b3ee4b714f5b9de0f65 Merge: 4606ddf16f1c7c6247134e3b1ceafe4204b7d335 c4bdb187033c908982e814af1b254d28ab3b1d3e Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 13:49:50 2010 +0100 Merge branch 'master' into gettext ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 22 +++++++++++---- scripts/lang-cleanup.sh | 64 ++++++++++---------------------------------- 2 files changed, 31 insertions(+), 55 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 51ff185..8c321be 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -93,6 +93,7 @@ fi LC_ALL=C date -u > RELEASE-DATE-${version} # Building Documentation.txt +echo "* Generating Documentation.txt" LC_ALL=C w3m -dump Documentation.html > Documentation.txt # Check for gettext support @@ -104,6 +105,7 @@ fi # Generate mo files if [ $GETTEXT -eq 1 ] ; then + echo "* Generating mo files" ./scripts/generate-mo fi @@ -131,28 +133,28 @@ for kit in $KITS ; do for comp in $COMPRESSIONS ; do case $comp in tbz|tgz) - echo "Creating $name.tar" + echo "* Creating $name.tar" tar cf $name.tar $name if [ $comp = tbz ] ; then - echo "Creating $name.tar.bz2" + echo "* Creating $name.tar.bz2" bzip2 -9k $name.tar fi if [ $comp = tgz ] ; then - echo "Creating $name.tar.gz" + echo "* Creating $name.tar.gz" gzip -9c $name.tar > $name.tar.gz fi rm $name.tar ;; zip) - echo "Creating $name.zip" + echo "* Creating $name.zip" zip -q -9 -r $name.zip $name ;; zip-7z) - echo "Creating $name.zip" + echo "* Creating $name.zip" 7za a -bd -tzip $name.zip $name > /dev/null ;; 7z) - echo "Creating $name.7z" + echo "* Creating $name.7z" 7za a -bd $name.7z $name > /dev/null ;; *) @@ -190,6 +192,14 @@ if [ $# -gt 0 ] ; then tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -` echo "* Tagging release as $tagname" git tag -a -m "Released $version" $tagname $branch + if echo $version | grep '[a-z_-]' ; then + echo "* Tagging release as TESTING" + git tag -a -f -m "Released $version" TESTING $branch + else + echo "* Tagging release as STABLE" + git tag -a -f -m "Released $version" STABLE $branch + fi + echo " Dont forget to push tags using: git push --tags" ;; *) echo "Unknown parameter: $1!" diff --git a/scripts/lang-cleanup.sh b/scripts/lang-cleanup.sh index d8688e9..b09674f 100755 --- a/scripts/lang-cleanup.sh +++ b/scripts/lang-cleanup.sh @@ -6,71 +6,37 @@ # Script for removing language selection from phpMyAdmin if [ $# -lt 1 ] ; then - echo "Usage: lang-cleanup.sh type ..." + echo "Usage: lang-cleanup.sh type" echo "Type can be one of:" echo " all-languages - nothing will be done" - echo " all-languages-utf-8-only - non utf-8 languages will be deleted" - echo " language - keeps utf-8 version of language" - echo " language-charset - keeps this exact language" + echo " english - no translations will be kept" + echo " langcode - keeps language" echo - echo "Types can be entered multiple times, all matched languages will be kept" + echo "Languages can be scpecified multiple times" exit 1 fi -# Construct expressions for find +# Expression for find match="" for type in "$@" ; do case $type in all-languages) - match="$match -and -false" + exit 0 ;; - all-languages-utf-8-only) - match="$match -and -not -name *-utf-8.inc.php" + english) + rm -rf po + rm -rf locale + exit 0 ;; *) - if [ -f lang/$type-utf-8.inc.php ] ; then - match="$match -and -not -name $type-utf-8.inc.php" - elif [ -f lang/$type.inc.php ] ; then - match="$match -and -not -name $type.inc.php" - else - echo "ERROR: $type seems to be wrong!" - exit 2 - fi + match="$match -and -not -name $type.po -and -not -path locale/$type/LC_MESSAGES/phpmyadmin.mo" ;; esac done # Delete unvanted languages -find lang -name \*.inc.php $match -print0 | xargs -0r rm - -# Cleanup libraries/select_lang.lib.php - -# Find languages we have -langmatch="$(awk -F, \ - 'BEGIN { pr = 1 } ; - /^\);/ { pr = 1 } ; - {if(!pr) print $2;}; - /^\$available_languages/ { pr = 0 };' \ - libraries/select_lang.lib.php \ - | tr -d \' \ - | while read lng ; do if [ -f lang/$lng.inc.php ] ; then echo $lng ; fi ; done \ - | tr '\n' '|' \ - | sed 's/|$//' \ - )" - -# Prepare working copy -tmp=`mktemp libraries/select_lang.lib.php.XXXX` -cat libraries/select_lang.lib.php > $tmp - -# Remove languages we don't have -awk -F, \ - 'BEGIN { pr = 1 } ; - /^\);/ { pr = 1 } ; - {if(pr) print $0;}; - /'$langmatch'/ {if (!pr) print $0;}; - /^\$available_languages/ { pr = 0 };' \ - $tmp > libraries/select_lang.lib.php - -# Final cleanup -rm -f $tmp +find po locale -type f $match -print0 | xargs -0r rm +# Delete empty directories +rmdir --ignore-fail-on-non-empty locale/*/* +rmdir --ignore-fail-on-non-empty locale/* hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, TESTING, updated. RELEASE_3_3_1RC1
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, TESTING has been updated to ea408fe0eb5482fc238bf45dae53cbdaefd096ad (tag) from d6dd3af508764f700b5625cfe7b0ec1ea21ee72c (which is now obsolete) tagging 37f1bcf204b1d39053c34bb5a0b86fe8470d7ece (tag) length 178 bytes tagged by Michal Čihař on Fri Mar 12 13:39:21 2010 +0100 - Log ----------------------------------------------------------------- Retag testing. ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, TESTING, updated. RELEASE_3_3_1RC1
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, TESTING has been updated to d6dd3af508764f700b5625cfe7b0ec1ea21ee72c (tag) from c5d58b76e50d90717a659f1c668870ce057134c8 (which is now obsolete) tagging 37f1bcf204b1d39053c34bb5a0b86fe8470d7ece (tag) length 178 bytes tagged by Michal Čihař on Fri Mar 12 13:33:02 2010 +0100 - Log ----------------------------------------------------------------- Retag testing. ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_10_3, updated. RELEASE_2_10_3
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, RELEASE_2_10_3 has been updated to 92782041231bbb66c18c2ea7c6c967ee04eb3cea (tag) from 8c6f5316782a4c7582a18e9ff7397172282d8320 (which is now obsolete) tagging 91e55da7fb34ca2bd08487bc6f3e6f9ca8c44fe6 (commit) replaces RELEASE_2_10_3RC1 tagged by Michal Čihař on Tue Feb 16 13:58:50 2010 +0100 - Log ----------------------------------------------------------------- Imported SVN tag for RELEASE_2_10_3 Marc Delisle (2): revert patch 1750500 2.10.3 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_10_2, updated. RELEASE_2_10_2
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, RELEASE_2_10_2 has been updated to d19c4f0788989843f5befc6b242bfab573cd8020 (tag) from 9baa2b415090a5e85f56cc6813e1d2b7da91b0e7 (which is now obsolete) tagging 132fadea517932cba4cf6eddb0c2027031e4c670 (commit) replaces RELEASE_2_10_1RC1 tagged by Michal Čihař on Tue Feb 16 13:58:50 2010 +0100 - Log ----------------------------------------------------------------- Imported SVN tag for RELEASE_2_10_2 Marc Delisle (22): bug #1712570 Deleting last record freezes in 2.10, strOptions does not yet exist bug #1717339 Missing header when deleting a checked column bug #1717477 Warning on Query page when db is empty unneeded $strDatabaseNoTable, use $strNoTablesFound instead bug #1721002 db rename -> undefined cfgRelation bug #1721571 CREATE database privilege not always detected bug #1715709 export in SQL format always includes procedures and functions bug #1722502 DROP TABLE in export view structure do not unset $total (and remove dead code in trunk) bug #1718787 Multi-server setup breaks Designer bug #1724401 Column truncation in repair table output patch #1726500 Wrong position of </tbody> Designer and multi-server: other problems bug #1728590 Detected failing session_start fails RFE #1714760 Obey ShowCreateDb on the Databases tab bug #1728590, last part of the fix 2.10.2-rc1 and 2.10.3-dev patch #1733762 Typo in message "INSERT DELAY", thanks to Victor Volkov patch #1730171 Dead message strLanguageFileNotFound, thanks to Victor Volkov patch #1731280 Avoid negative exponent in gmp_pow(), thanks to anosek 2.10.2 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_10_1RC1, updated. RELEASE_2_10_1RC1
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, RELEASE_2_10_1RC1 has been updated to a57b74aa1dedab160a7fcfa0d68100ffcc557641 (tag) from 6477d6e32e2dcddb6db078b2fd9413b401a0c227 (which is now obsolete) tagging e51272900fac81e9fe4250b78e2a3ff378a677d6 (commit) replaces RELEASE_2_10_0 tagged by Michal Čihař on Tue Feb 16 13:58:50 2010 +0100 - Log ----------------------------------------------------------------- Imported SVN tag for RELEASE_2_10_1RC1 Marc Delisle (26): 2.10.1-dev set default value for ssl connection to MYSQL to FALSE use PMA_getenv('PHP_SELF') swedish updates finnish updates bug #1671403 [parser] using "client" as table name bug #1673599 [core] Call to undefined function PMA_isSuperuser() bug not present in a release bug #1680952 [core] undefined function PMA_getUvaCondition() bug #1596328 [export] drop support for POSTGRESQL compatibility mode bug #1609443 [privileges] Grant all priv. on wildcard name (fix message) bug # 1685376 undefined onserver bug was not released, thanks Sebastian patch #1681620 [interface] support reordering of ['ColumnTypes'] insert a row if BLOB is empty bug #1690718 Can't edit if BLOB and no PK [lang] brazilian-portuguese update, thanks to Airon Luis Pereira fix this kind of queries: select * from mytable where myid >= 1 undefined index when deleting a bookmark typo patch #1694234, pma_designer_coords in create_tables.sql, thanks to Isaac Bennetch danish updates test condition has to be reversed for this to work bug #1672636 [export] PDF export too wide remove 2006 entries 2.10.1-rc1 Sebastian Mendel (9): merge fixes from trunk (bugs #1672379. #1671813, #1541147) changed message for possible exploit detection backported bugfix for bug #1541147 corrected changelog bug #1679801 [core] XSS vulnerability in PMA_sanitize() bug #1676033 [core] pow(int,int) causes overflow backporte some bugfixes from trunk intp QA_2_10: replaced ctype_digit() with is_numeric() bug #1690561 Blobs being cleared on Edit of row ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_10_0_2, updated. RELEASE_2_10_0_2
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, RELEASE_2_10_0_2 has been updated to 842328373242e0ebad47aa1f740a7bd2497735ac (tag) from 177a72e7a88ee7d5b53fbf90c1f2783dde4c8fd8 (which is now obsolete) tagging a0a3237d6720d1c6f3b702c7198cf1c225302f6c (commit) replaces RELEASE_2_10_0_1 tagged by Michal Čihař on Tue Feb 16 13:58:50 2010 +0100 - Log ----------------------------------------------------------------- Imported SVN tag for RELEASE_2_10_0_2 Marc Delisle (2): bug #1671813 CVE-2006-1549 deep recursion crash 2.10.0.2 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0