no need to check the version

This commit is contained in:
Marc Delisle
2005-10-16 19:24:47 +00:00
parent 72f452205e
commit 5760c8fa5b
2 changed files with 8 additions and 17 deletions

View File

@@ -186,18 +186,12 @@ if ($abort == FALSE) {
// We also need this to correctly learn if a TIMESTAMP is NOT NULL, since // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since
// SHOW FULL FIELDS says NULL and SHOW CREATE TABLE says NOT NULL (tested // SHOW FULL FIELDS says NULL and SHOW CREATE TABLE says NOT NULL (tested
// in MySQL 4.0.25). I was able to find that SHOW CREATE TABLE existed // in MySQL 4.0.25).
// at least in MySQL 3.23.51.
if (PMA_MYSQL_INT_VERSION >= 32351) { $show_create_table = PMA_DBI_fetch_value(
$show_create_table_query = 'SHOW CREATE TABLE ' 'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table),
. PMA_backquote($db) . '.' . PMA_backquote($table); 0, 1 );
$show_create_table_res = PMA_DBI_query($show_create_table_query); $analyzed_sql = PMA_SQP_analyze( PMA_SQP_parse( $show_create_table ) );
list(,$show_create_table) = PMA_DBI_fetch_row($show_create_table_res);
PMA_DBI_free_result($show_create_table_res);
unset($show_create_table_res, $show_create_table_query);
$analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));
}
require('./tbl_properties.inc.php'); require('./tbl_properties.inc.php');
} }

View File

@@ -87,15 +87,12 @@ $fields_cnt = PMA_DBI_num_rows($fields_rs);
// //
// We also need this to correctly learn if a TIMESTAMP is NOT NULL, since // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since
// SHOW FULL FIELDS says NULL and SHOW CREATE TABLE says NOT NULL (tested // SHOW FULL FIELDS says NULL and SHOW CREATE TABLE says NOT NULL (tested
// in MySQL 4.0.25). I was able to find that SHOW CREATE TABLE existed // in MySQL 4.0.25).
// at least in MySQL 3.23.51.
if (PMA_MYSQL_INT_VERSION >= 32351) { $show_create_table = PMA_DBI_fetch_value(
$show_create_table = PMA_DBI_fetch_value(
'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), 'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table),
0, 1 ); 0, 1 );
$analyzed_sql = PMA_SQP_analyze( PMA_SQP_parse( $show_create_table ) ); $analyzed_sql = PMA_SQP_analyze( PMA_SQP_parse( $show_create_table ) );
}
/** /**
* Displays the table structure ('show table' works correct since 3.23.03) * Displays the table structure ('show table' works correct since 3.23.03)