bug 994942

This commit is contained in:
Marc Delisle
2004-08-02 01:05:39 +00:00
parent 747bbd14f8
commit d9c061cdc9
2 changed files with 5 additions and 1 deletions

View File

@@ -11,6 +11,8 @@ $Source$
* tbl_move_copy.php: bug 995098, cannot copy table data only * tbl_move_copy.php: bug 995098, cannot copy table data only
* libraries/dbi/mysqli.dbi.lib.php: use faster AND comparison for flags, * libraries/dbi/mysqli.dbi.lib.php: use faster AND comparison for flags,
as suggested by Michal as suggested by Michal
* libraries/export/sql.php: workaround for datetime export because
mysqli under MySQL 4.1.3 reports a datetime as binary
2004-07-31 Alexander M. Turek <me@derrabus.de> 2004-07-31 Alexander M. Turek <me@derrabus.de>
* tbl_change.php, tbl_replace.php, libraries/relation.lib.php: Small * tbl_change.php, tbl_replace.php, libraries/relation.lib.php: Small

View File

@@ -553,7 +553,9 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
} elseif ($fields_meta[$j]->numeric) { } elseif ($fields_meta[$j]->numeric) {
$values[] = $row[$j]; $values[] = $row[$j];
// a binary field // a binary field
} else if (stristr($field_flags[$j], 'BINARY') && isset($GLOBALS['hexforbinary'])) { // Note: with mysqli, under MySQL 4.1.3, we get the flag
// "binary" for a datetime (I don't know why)
} else if (stristr($field_flags[$j], 'BINARY') && isset($GLOBALS['hexforbinary']) && $fields_meta[$j]->type != 'datetime') {
$values[] = '0x' . bin2hex($row[$j]); $values[] = '0x' . bin2hex($row[$j]);
// something else -> treat as a string // something else -> treat as a string
} else { } else {