nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Michal Čihař
2010-07-26 15:51:48 +02:00
parent 15dfc4879e 049fc7fef7
commit bcc372b5c5
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -97,8 +97,9 @@ $Id$
- [interface] Better formatting for SQL validator results. - [interface] Better formatting for SQL validator results.
3.3.6.0 (not yet released) 3.3.6.0 (not yet released)
- bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
- bug #3033063 [core] Navi gets wrong db name - bug #3033063 [core] Navi gets wrong db name
- bug #3031705 [core] Fix generating condition for real numbers by comparing
them to string.
3.3.5.0 (not yet released) 3.3.5.0 (not yet released)
- patch #2932113 [information_schema] Slow export when having lots of - patch #2932113 [information_schema] Slow export when having lots of

3
libraries/common.lib.php
View File

@@ -2105,7 +2105,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
$condition .= 'IS NULL AND'; $condition .= 'IS NULL AND';
} else { } else {
// timestamp is numeric on some MySQL 4.1 // timestamp is numeric on some MySQL 4.1
if ($meta->numeric && $meta->type != 'timestamp') { // for real we use CONCAT above and it should compare to string
if ($meta->numeric && $meta->type != 'timestamp' && $meta->type != 'real') {
$condition .= '= ' . $row[$i] . ' AND'; $condition .= '= ' . $row[$i] . ' AND';
} elseif (($meta->type == 'blob' || $meta->type == 'string') } elseif (($meta->type == 'blob' || $meta->type == 'string')
// hexify only if this is a true not empty BLOB or a BINARY // hexify only if this is a true not empty BLOB or a BINARY

4
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -488,8 +488,8 @@ function PMA_DBI_get_fields_meta($result)
{ {
// Build an associative array for a type look up // Build an associative array for a type look up
$typeAr = array(); $typeAr = array();
$typeAr[MYSQLI_TYPE_DECIMAL] = 'decimal'; $typeAr[MYSQLI_TYPE_DECIMAL] = 'real';
$typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real';
$typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_BIT] = 'int';
$typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int';
$typeAr[MYSQLI_TYPE_SHORT] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int';