- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10548-g452dce7
by Marc Delisle 09 Oct '10

09 Oct '10

The branch, master has been updated via 452dce72a2d256b37af22c6b537579c8807b6fa0 (commit) from ca7ef52e70186be94d0498c3b9afd830215ef0bf (commit) - Log ----------------------------------------------------------------- commit 452dce72a2d256b37af22c6b537579c8807b6fa0 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 9 06:49:55 2010 -0400 missing end tag ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 104af09..8460169 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2563,7 +2563,7 @@ function PMA_generate_slider_effect($id, $message) //]]> </script> <noscript> - <div id="<?php echo $id; ?>"> + <div id="<?php echo $id; ?>"></div> </noscript> <?php } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10547-gca7ef52
by Marc Delisle 09 Oct '10

09 Oct '10

The branch, master has been updated via ca7ef52e70186be94d0498c3b9afd830215ef0bf (commit) from 7cbdcd6be1e290b8659e2573686af6c97ac04328 (commit) - Log ----------------------------------------------------------------- commit ca7ef52e70186be94d0498c3b9afd830215ef0bf Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 9 06:43:08 2010 -0400 tag error ----------------------------------------------------------------------- Summary of changes: main.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/main.php b/main.php index 0cd46f5..6e515d9 100644 --- a/main.php +++ b/main.php @@ -150,7 +150,7 @@ echo '</ul>'; echo '<ul>'; echo PMA_printListItem(__('More settings'), 'li_user_preferences', './prefs_manage.php?' . $common_url_query); -echo '<ul>'; +echo '</ul>'; echo '</div>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10546-g7cbdcd6
by Marc Delisle 09 Oct '10

09 Oct '10

The branch, master has been updated via 7cbdcd6be1e290b8659e2573686af6c97ac04328 (commit) via 2d4b9e2aea9eb6f3914bbfdd574fd13bac424e24 (commit) from b5cd7e69ea4d29ad6b7a8e12bbc8fdec9966b72f (commit) - Log ----------------------------------------------------------------- commit 7cbdcd6be1e290b8659e2573686af6c97ac04328 Merge: b5cd7e69ea4d29ad6b7a8e12bbc8fdec9966b72f 2d4b9e2aea9eb6f3914bbfdd574fd13bac424e24 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 9 06:37:30 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_operations.php | 55 ++++++++++++++++++++++++++++----------------------- tbl_structure.php | 7 +++-- 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ef3af3..166cede 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ - bug #3056023 [import] USE query not working - bug #3038193 [display] Error when editing row with GEOMETRY column - bug #3062454 [interface] Display routines/events also when no tables are defined +- support ARIA storage engine as well as its previous name MARIA 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/tbl_operations.php b/tbl_operations.php index d5fd6db..8b25c8c 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -46,11 +46,11 @@ PMA_DBI_select_db($GLOBALS['db']); require './libraries/tbl_info.inc.php'; // define some globals here, for improved syntax in the conditionals -$is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false; +$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false; // set initial value of these globals, based on the current table engine PMA_set_global_variables_for_engine($tbl_type); -if ($is_maria) { +if ($is_aria) { // the value for transactional can be implicit // (no create option found, in this case it means 1) // or explicit (option found with a value of 0 or 1) @@ -92,7 +92,7 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); - if ($is_maria) { + if ($is_aria) { $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; } @@ -103,7 +103,7 @@ if (isset($_REQUEST['submitoptions'])) { $table_alters[] = 'DEFAULT ' . PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']); } - if (($is_myisam_or_maria || $is_isam) + if (($is_myisam_or_aria || $is_isam) && isset($_REQUEST['new_pack_keys']) && $_REQUEST['new_pack_keys'] != (string)$pack_keys) { $table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys']; @@ -111,37 +111,37 @@ if (isset($_REQUEST['submitoptions'])) { $checksum = empty($checksum) ? '0' : '1'; $_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1'; - if ($is_myisam_or_maria + if ($is_myisam_or_aria && $_REQUEST['new_checksum'] !== $checksum) { $table_alters[] = 'checksum = ' . $_REQUEST['new_checksum']; } $_REQUEST['new_transactional'] = empty($_REQUEST['new_transactional']) ? '0' : '1'; - if ($is_maria + if ($is_aria && $_REQUEST['new_transactional'] !== $transactional) { $table_alters[] = 'TRANSACTIONAL = ' . $_REQUEST['new_transactional']; } $_REQUEST['new_page_checksum'] = empty($_REQUEST['new_page_checksum']) ? '0' : '1'; - if ($is_maria + if ($is_aria && $_REQUEST['new_page_checksum'] !== $page_checksum) { $table_alters[] = 'PAGE_CHECKSUM = ' . $_REQUEST['new_page_checksum']; } $delay_key_write = empty($delay_key_write) ? '0' : '1'; $_REQUEST['new_delay_key_write'] = empty($_REQUEST['new_delay_key_write']) ? '0' : '1'; - if ($is_myisam_or_maria + if ($is_myisam_or_aria && $_REQUEST['new_delay_key_write'] !== $delay_key_write) { $table_alters[] = 'delay_key_write = ' . $_REQUEST['new_delay_key_write']; } - if (($is_myisam_or_maria || $is_innodb || $is_pbxt) + if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_auto_increment']) && (! isset($auto_increment) || $_REQUEST['new_auto_increment'] !== $auto_increment)) { $table_alters[] = 'auto_increment = ' . PMA_sqlAddslashes($_REQUEST['new_auto_increment']); } - if (($is_myisam_or_maria || $is_innodb || $is_pbxt) + if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_row_format']) && (! isset($row_format) || strtolower($_REQUEST['new_row_format']) !== strtolower($row_format))) { $table_alters[] = 'ROW_FORMAT = ' . PMA_sqlAddslashes($_REQUEST['new_row_format']); @@ -363,7 +363,7 @@ if (strstr($show_comment, '; InnoDB free') === false) { </td> </tr> <?php -if ($is_myisam_or_maria || $is_isam) { +if ($is_myisam_or_aria || $is_isam) { ?> <tr> <td><label for="new_pack_keys">PACK_KEYS</label></td> @@ -383,7 +383,7 @@ if ($is_myisam_or_maria || $is_isam) { <?php } // end if (MYISAM|ISAM) -if ($is_myisam_or_maria) { +if ($is_myisam_or_aria) { ?> <tr><td><label for="new_checksum">CHECKSUM</label></td> <td><input type="checkbox" name="new_checksum" id="new_checksum" @@ -406,7 +406,7 @@ if ($is_myisam_or_maria) { <?php } // end if (MYISAM) -if ($is_maria) { +if ($is_aria) { ?> <tr><td><label for="new_transactional">TRANSACTIONAL</label></td> <td><input type="checkbox" name="new_transactional" id="new_transactional" @@ -427,10 +427,10 @@ if ($is_maria) { </tr> <?php -} // end if (MARIA) +} // end if (ARIA) if (isset($auto_increment) && strlen($auto_increment) > 0 - && ($is_myisam_or_maria || $is_innodb || $is_pbxt)) { + && ($is_myisam_or_aria || $is_innodb || $is_pbxt)) { ?> <tr><td><label for="auto_increment_opt">AUTO_INCREMENT</label></td> <td><input type="text" name="new_auto_increment" id="auto_increment_opt" @@ -443,6 +443,11 @@ if (isset($auto_increment) && strlen($auto_increment) > 0 // option values as keys then the dropdown option labels $possible_row_formats = array( + 'ARIA' => array( + 'FIXED' => 'FIXED', + 'DYNAMIC' => 'DYNAMIC', + 'PAGE' => 'PAGE' + ), 'MARIA' => array( 'FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC', @@ -569,8 +574,8 @@ if (isset($possible_row_formats[$tbl_type])) { <ul> <?php // Note: BERKELEY (BDB) is no longer supported, starting with MySQL 5.1 -if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { - if ($is_myisam_or_maria || $is_innodb) { +if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { + if ($is_myisam_or_aria || $is_innodb) { $this_url_params = array_merge($url_params, array('sql_query' => 'CHECK TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -590,7 +595,7 @@ if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { </li> <?php } - if ($is_myisam_or_maria || $is_berkeleydb) { + if ($is_myisam_or_aria || $is_berkeleydb) { $this_url_params = array_merge($url_params, array('sql_query' => 'ANALYZE TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -600,7 +605,7 @@ if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { </li> <?php } - if ($is_myisam_or_maria) { + if ($is_myisam_or_aria) { $this_url_params = array_merge($url_params, array('sql_query' => 'REPAIR TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -610,7 +615,7 @@ if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { </li> <?php } - if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { + if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { $this_url_params = array_merge($url_params, array('sql_query' => 'OPTIMIZE TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -797,14 +802,14 @@ require './libraries/footer.inc.php'; function PMA_set_global_variables_for_engine($tbl_type) { - global $is_myisam_or_maria, $is_innodb, $is_isam, $is_berkeleydb, $is_maria, $is_pbxt; + global $is_myisam_or_aria, $is_innodb, $is_isam, $is_berkeleydb, $is_aria, $is_pbxt; - $is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false; + $is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false; $upper_tbl_type = strtoupper($tbl_type); - //Options that apply to MYISAM usually apply to MARIA - $is_myisam_or_maria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'MARIA'); - $is_maria = ($upper_tbl_type == 'MARIA'); + //Options that apply to MYISAM usually apply to ARIA + $is_myisam_or_aria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'ARIA' || $upper_tbl_type == 'MARIA'); + $is_aria = ($upper_tbl_type == 'ARIA'); $is_isam = ($upper_tbl_type == 'ISAM'); $is_innodb = ($upper_tbl_type == 'INNODB'); diff --git a/tbl_structure.php b/tbl_structure.php index f33438e..b7663ec 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -444,7 +444,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { ?> </td> <?php - if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA') + if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA') // FULLTEXT is possible on TEXT, CHAR and VARCHAR && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) { echo "\n"; @@ -564,7 +564,8 @@ if (! $tbl_is_view && ! $db_is_information_schema) { PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png'); PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png'); } - if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA')) { + + if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')) { PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png'); } } @@ -791,7 +792,7 @@ if ($cfg['ShowStats']) { <?php } // Optimize link if overhead - if (isset($free_size) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA' || $tbl_type == 'BDB')) { + if (isset($free_size) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA' || $tbl_type == 'BDB')) { ?> <tr class="tblFooters"> <td colspan="3" align="center"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-18-g2d4b9e2
by Marc Delisle 09 Oct '10

09 Oct '10

The branch, QA_3_3 has been updated via 2d4b9e2aea9eb6f3914bbfdd574fd13bac424e24 (commit) from 2d7cbdfc4d6ad9066dad49918ed710f872e59020 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_operations.php | 55 ++++++++++++++++++++++++++++----------------------- tbl_structure.php | 6 ++-- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9520b7..2385125 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3056023 [import] USE query not working - bug #3038193 [display] Error when editing row with GEOMETRY column - bug #3062454 [interface] Display routines/events also when no tables are defined +- support ARIA storage engine as well as its previous name MARIA 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/tbl_operations.php b/tbl_operations.php index 98e5f1b..10d7cd3 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -49,11 +49,11 @@ PMA_DBI_select_db($GLOBALS['db']); require './libraries/tbl_info.inc.php'; // define some globals here, for improved syntax in the conditionals -$is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false; +$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false; // set initial value of these globals, based on the current table engine PMA_set_global_variables_for_engine($tbl_type); -if ($is_maria) { +if ($is_aria) { // the value for transactional can be implicit // (no create option found, in this case it means 1) // or explicit (option found with a value of 0 or 1) @@ -95,7 +95,7 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); - if ($is_maria) { + if ($is_aria) { $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; } @@ -106,7 +106,7 @@ if (isset($_REQUEST['submitoptions'])) { $table_alters[] = 'DEFAULT ' . PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']); } - if (($is_myisam_or_maria || $is_isam) + if (($is_myisam_or_aria || $is_isam) && isset($_REQUEST['new_pack_keys']) && $_REQUEST['new_pack_keys'] != (string)$pack_keys) { $table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys']; @@ -114,37 +114,37 @@ if (isset($_REQUEST['submitoptions'])) { $checksum = empty($checksum) ? '0' : '1'; $_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1'; - if ($is_myisam_or_maria + if ($is_myisam_or_aria && $_REQUEST['new_checksum'] !== $checksum) { $table_alters[] = 'checksum = ' . $_REQUEST['new_checksum']; } $_REQUEST['new_transactional'] = empty($_REQUEST['new_transactional']) ? '0' : '1'; - if ($is_maria + if ($is_aria && $_REQUEST['new_transactional'] !== $transactional) { $table_alters[] = 'TRANSACTIONAL = ' . $_REQUEST['new_transactional']; } $_REQUEST['new_page_checksum'] = empty($_REQUEST['new_page_checksum']) ? '0' : '1'; - if ($is_maria + if ($is_aria && $_REQUEST['new_page_checksum'] !== $page_checksum) { $table_alters[] = 'PAGE_CHECKSUM = ' . $_REQUEST['new_page_checksum']; } $delay_key_write = empty($delay_key_write) ? '0' : '1'; $_REQUEST['new_delay_key_write'] = empty($_REQUEST['new_delay_key_write']) ? '0' : '1'; - if ($is_myisam_or_maria + if ($is_myisam_or_aria && $_REQUEST['new_delay_key_write'] !== $delay_key_write) { $table_alters[] = 'delay_key_write = ' . $_REQUEST['new_delay_key_write']; } - if (($is_myisam_or_maria || $is_innodb || $is_pbxt) + if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_auto_increment']) && (! isset($auto_increment) || $_REQUEST['new_auto_increment'] !== $auto_increment)) { $table_alters[] = 'auto_increment = ' . PMA_sqlAddslashes($_REQUEST['new_auto_increment']); } - if (($is_myisam_or_maria || $is_innodb || $is_pbxt) + if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_row_format']) && (! isset($row_format) || strtolower($_REQUEST['new_row_format']) !== strtolower($row_format))) { $table_alters[] = 'ROW_FORMAT = ' . PMA_sqlAddslashes($_REQUEST['new_row_format']); @@ -364,7 +364,7 @@ if (strstr($show_comment, '; InnoDB free') === false) { </td> </tr> <?php -if ($is_myisam_or_maria || $is_isam) { +if ($is_myisam_or_aria || $is_isam) { ?> <tr> <td><label for="new_pack_keys">PACK_KEYS</label></td> @@ -384,7 +384,7 @@ if ($is_myisam_or_maria || $is_isam) { <?php } // end if (MYISAM|ISAM) -if ($is_myisam_or_maria) { +if ($is_myisam_or_aria) { ?> <tr><td><label for="new_checksum">CHECKSUM</label></td> <td><input type="checkbox" name="new_checksum" id="new_checksum" @@ -407,7 +407,7 @@ if ($is_myisam_or_maria) { <?php } // end if (MYISAM) -if ($is_maria) { +if ($is_aria) { ?> <tr><td><label for="new_transactional">TRANSACTIONAL</label></td> <td><input type="checkbox" name="new_transactional" id="new_transactional" @@ -428,10 +428,10 @@ if ($is_maria) { </tr> <?php -} // end if (MARIA) +} // end if (ARIA) if (isset($auto_increment) && strlen($auto_increment) > 0 - && ($is_myisam_or_maria || $is_innodb || $is_pbxt)) { + && ($is_myisam_or_aria || $is_innodb || $is_pbxt)) { ?> <tr><td><label for="auto_increment_opt">AUTO_INCREMENT</label></td> <td><input type="text" name="new_auto_increment" id="auto_increment_opt" @@ -444,6 +444,11 @@ if (isset($auto_increment) && strlen($auto_increment) > 0 // option values as keys then the dropdown option labels $possible_row_formats = array( + 'ARIA' => array( + 'FIXED' => 'FIXED', + 'DYNAMIC' => 'DYNAMIC', + 'PAGE' => 'PAGE' + ), 'MARIA' => array( 'FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC', @@ -570,8 +575,8 @@ if (isset($possible_row_formats[$tbl_type])) { <ul> <?php // Note: BERKELEY (BDB) is no longer supported, starting with MySQL 5.1 -if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { - if ($is_myisam_or_maria || $is_innodb) { +if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { + if ($is_myisam_or_aria || $is_innodb) { $this_url_params = array_merge($url_params, array('sql_query' => 'CHECK TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -591,7 +596,7 @@ if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { </li> <?php } - if ($is_myisam_or_maria || $is_berkeleydb) { + if ($is_myisam_or_aria || $is_berkeleydb) { $this_url_params = array_merge($url_params, array('sql_query' => 'ANALYZE TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -601,7 +606,7 @@ if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { </li> <?php } - if ($is_myisam_or_maria) { + if ($is_myisam_or_aria) { $this_url_params = array_merge($url_params, array('sql_query' => 'REPAIR TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -611,7 +616,7 @@ if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { </li> <?php } - if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { + if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) { $this_url_params = array_merge($url_params, array('sql_query' => 'OPTIMIZE TABLE ' . PMA_backquote($GLOBALS['table']))); ?> @@ -748,14 +753,14 @@ require_once './libraries/footer.inc.php'; function PMA_set_global_variables_for_engine($tbl_type) { - global $is_myisam_or_maria, $is_innodb, $is_isam, $is_berkeleydb, $is_maria, $is_pbxt; + global $is_myisam_or_aria, $is_innodb, $is_isam, $is_berkeleydb, $is_aria, $is_pbxt; - $is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false; + $is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false; $upper_tbl_type = strtoupper($tbl_type); - //Options that apply to MYISAM usually apply to MARIA - $is_myisam_or_maria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'MARIA'); - $is_maria = ($upper_tbl_type == 'MARIA'); + //Options that apply to MYISAM usually apply to ARIA + $is_myisam_or_aria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'ARIA' || $upper_tbl_type == 'MARIA'); + $is_aria = ($upper_tbl_type == 'ARIA'); $is_isam = ($upper_tbl_type == 'ISAM'); $is_innodb = ($upper_tbl_type == 'INNODB'); diff --git a/tbl_structure.php b/tbl_structure.php index fbe844d..3242d48 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -405,7 +405,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { ?> </td> <?php - if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA') + if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA') // FULLTEXT is possible on TEXT, CHAR and VARCHAR && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) { echo "\n"; @@ -460,7 +460,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', $strUnique, 'b_unique.png'); PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', $strIndex, 'b_index.png'); } - if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA')) { + if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')) { PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', $strIdxFulltext, 'b_ftext.png'); } } @@ -688,7 +688,7 @@ if ($cfg['ShowStats']) { <?php } // Optimize link if overhead - if (isset($free_size) && ($tbl_type == 'MYISAM' || $tbl_type == 'MARIA' || $tbl_type == 'BDB')) { + if (isset($free_size) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA' || $tbl_type == 'BDB')) { ?> <tr class="tblFooters"> <td colspan="3" align="center"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10544-gb5cd7e6
by Marc Delisle 08 Oct '10

08 Oct '10

The branch, master has been updated via b5cd7e69ea4d29ad6b7a8e12bbc8fdec9966b72f (commit) from 8eec123dd8f45a45b7324ba0e89b0da0e688badd (commit) - Log ----------------------------------------------------------------- commit b5cd7e69ea4d29ad6b7a8e12bbc8fdec9966b72f Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 8 13:21:27 2010 -0400 inline edit (in tools) and ajax mode ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b1da1de..104af09 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1232,18 +1232,23 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view echo '</form>'; } + // in the tools div, only display the Inline link when not in ajax + // mode because 1) it currently does not work and 2) we would + // have two similar mechanisms on the page for the same goal + if ($GLOBALS['is_ajax_request'] === false) { // see in js/functions.js the jQuery code attached to id inline_edit // document.write conflicts with jQuery, hence used $().append() - $inline_edit = "<script type=\"text/javascript\">\n" . - "//<![CDATA[\n" . - "$('.tools').append('[<a href=\"#\" title=\"" . - PMA_escapeJsString(__('Inline edit of this query')) . - "\" id=\"inline_edit\">" . - PMA_escapeJsString(__('Inline')) . - "</a>]');\n" . - "//]]>\n" . - "</script>"; - echo $inline_edit . $edit_link . $explain_link . $php_link . $refresh_link . $validate_link; + echo "<script type=\"text/javascript\">\n" . + "//<![CDATA[\n" . + "$('.tools').append('[<a href=\"#\" title=\"" . + PMA_escapeJsString(__('Inline edit of this query')) . + "\" id=\"inline_edit\">" . + PMA_escapeJsString(__('Inline')) . + "</a>]');\n" . + "//]]>\n" . + "</script>"; + } + echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link; echo '</div>'; } echo '</div><br />' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10543-g8eec123
by Marc Delisle 08 Oct '10

08 Oct '10

The branch, master has been updated via 8eec123dd8f45a45b7324ba0e89b0da0e688badd (commit) from 7d9a0f439b01a5547c262a94363efaa4ad1dcbf5 (commit) - Log ----------------------------------------------------------------- commit 8eec123dd8f45a45b7324ba0e89b0da0e688badd Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 8 12:53:06 2010 -0400 we should not prefix a js variable name with dollar sign unless it is a jQuery object ----------------------------------------------------------------------- Summary of changes: js/functions.js | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/functions.js b/js/functions.js index 03cf186..57bbd88 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1722,23 +1722,23 @@ function changeMIMEType(db, table, reference, mime_type) * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ - var $oldText,$db,$table,$token,$sql_query; - $oldText=$(".inner_sql").html(); + var oldText,db,table,token,sql_query; + oldText=$(".inner_sql").html(); $("#inline_edit").click(function(){ - $db=$("input[name='db']").val(); - $table=$("input[name='table']").val(); - $token=$("input[name='token']").val(); - $sql_query=$("input[name='sql_query']").val(); - $(".inner_sql").replaceWith("<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">"+ $sql_query +"</textarea><input type=\"button\" id=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\"><input type=\"button\" id=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">"); + db=$("input[name='db']").val(); + table=$("input[name='table']").val(); + token=$("input[name='token']").val(); + sql_query=$("input[name='sql_query']").val(); + $(".inner_sql").replaceWith("<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">"+ sql_query +"</textarea><input type=\"button\" id=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\"><input type=\"button\" id=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">"); return false; }); $("#btnSave").live("click",function(){ - window.location.replace("import.php?db="+$db+"&table="+$table+"&sql_query="+$("#sql_query_edit").val()+"&show_query=1&token="+$token+""); + window.location.replace("import.php?db=" + db +"&table=" + table + "&sql_query=" + $("#sql_query_edit").val()+"&show_query=1&token=" + token + ""); }); $("#btnDiscard").live("click",function(){ - $(".sql").html("<span class=\"syntax\"><span class=\"inner_sql\">"+$oldText+"</span></span>"); + $(".sql").html("<span class=\"syntax\"><span class=\"inner_sql\">" + oldText + "</span></span>"); }); $('.sqlbutton').click(function(evt){ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10542-g7d9a0f4
by Marc Delisle 08 Oct '10

08 Oct '10

The branch, master has been updated via 7d9a0f439b01a5547c262a94363efaa4ad1dcbf5 (commit) from fe5577568d6d63f6b49bfb33f3b104baac37463a (commit) - Log ----------------------------------------------------------------- commit 7d9a0f439b01a5547c262a94363efaa4ad1dcbf5 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 8 08:05:51 2010 -0400 hide previous results when showing an error ----------------------------------------------------------------------- Summary of changes: js/sql.js | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/js/sql.js b/js/sql.js index d40cdd4..2eaff0c 100644 --- a/js/sql.js +++ b/js/sql.js @@ -197,6 +197,7 @@ $(document).ready(function() { $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); + $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { $form.find('input[name=db]').val(data.db); @@ -211,8 +212,10 @@ $(document).ready(function() { else if (data.success == false ) { // show an error message that stays on screen $('#sqlqueryform').before(data.error); + $('#sqlqueryresults').hide(); } else { + $('#sqlqueryresults').show(); $("#sqlqueryresults").html(data); $("#sqlqueryresults").trigger('appendAnchor'); if($("#togglequerybox").siblings(":visible").length > 0) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10541-gfe55775
by Marc Delisle 08 Oct '10

08 Oct '10

The branch, master has been updated via fe5577568d6d63f6b49bfb33f3b104baac37463a (commit) from 2845fbb451cca0485b2fa82d2a77b4ee1fcfba6e (commit) - Log ----------------------------------------------------------------- commit fe5577568d6d63f6b49bfb33f3b104baac37463a Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 8 06:23:27 2010 -0400 bug #3072492 Error for wrong SQL disappears ----------------------------------------------------------------------- Summary of changes: js/sql.js | 6 +++++- sql.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index 8979251..d40cdd4 100644 --- a/js/sql.js +++ b/js/sql.js @@ -184,6 +184,9 @@ $(document).ready(function() { */ $("#sqlqueryform").live('submit', function(event) { event.preventDefault(); + // remove any div containing a previous error message + $('.error').remove(); + $form = $(this); PMA_ajaxShowMessage(); @@ -206,7 +209,8 @@ $(document).ready(function() { } } else if (data.success == false ) { - PMA_ajaxShowMessage(data.error, 50000); + // show an error message that stays on screen + $('#sqlqueryform').before(data.error); } else { $("#sqlqueryresults").html(data); diff --git a/sql.php b/sql.php index 898c893..f4b3ed4 100644 --- a/sql.php +++ b/sql.php @@ -377,7 +377,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $table = ''; } $active_page = $goto; - $message = htmlspecialchars(PMA_Message::rawError($error)); + $message = PMA_Message::rawError(htmlspecialchars($error)); if( $GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, false); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10540-g2845fbb
by Dieter Adriaenssens 07 Oct '10

07 Oct '10

The branch, master has been updated via 2845fbb451cca0485b2fa82d2a77b4ee1fcfba6e (commit) via 4bc347507662d0ef62e2897390191b9e206db809 (commit) via 2d7cbdfc4d6ad9066dad49918ed710f872e59020 (commit) from 7f41f94a0e93a8c2eaaabe3754f9ae3a9d7bb5e4 (commit) - Log ----------------------------------------------------------------- commit 2845fbb451cca0485b2fa82d2a77b4ee1fcfba6e Merge: 4bc347507662d0ef62e2897390191b9e206db809 7f41f94a0e93a8c2eaaabe3754f9ae3a9d7bb5e4 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Oct 7 21:17:55 2010 +0200 Merge branch 'master' of ssh://ruleant@phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 4bc347507662d0ef62e2897390191b9e206db809 Merge: 90c48f8696415f257d97dec8194568b0b4c0ca89 2d7cbdfc4d6ad9066dad49918ed710f872e59020 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Oct 7 21:16:35 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/db_events.inc.php | 5 ----- libraries/db_routines.inc.php | 5 ----- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 429f8bc..82ef51f 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -8,11 +8,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * Append goto to ulr_query. - */ -$url_query .= '&goto=db_structure.php'; - $events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); if ($events) { diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index c0231d9..49819dd 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -18,11 +18,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * Append goto to ulr_query. - */ -$url_query .= '&goto=db_structure.php'; - $routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); if ($routines) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-17-g2d7cbdf
by Dieter Adriaenssens 07 Oct '10

07 Oct '10

The branch, QA_3_3 has been updated via 2d7cbdfc4d6ad9066dad49918ed710f872e59020 (commit) from 8c34269e520aaba4ddbba25e938d5338db4eed7d (commit) - Log ----------------------------------------------------------------- commit 2d7cbdfc4d6ad9066dad49918ed710f872e59020 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Oct 7 21:15:40 2010 +0200 parameter is already added to url ----------------------------------------------------------------------- Summary of changes: libraries/db_events.inc.php | 5 ----- libraries/db_routines.inc.php | 5 ----- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 64298ec..d386170 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -9,11 +9,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * Append goto to ulr_query. - */ -$url_query .= '&goto=db_structure.php'; - $events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); if ($events) { diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index 96da080..f912ae0 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -19,11 +19,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * Append goto to ulr_query. - */ -$url_query .= '&goto=db_structure.php'; - $routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); if ($routines) { hooks/post-receive -- phpMyAdmin

1 0