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

[dbi] Incorrect interpretation for some mysqli field flags

Browse Source
This commit is contained in:
Marc Delisle
2008-04-27 15:45:50 +00:00
parent 4d4ec9ccc9
commit cce08fc068
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -53,6 +53,7 @@ danbarry
2.11.7.0 (not yet released) 2.11.7.0 (not yet released)
- bug #1908719 [interface] New field cannot be auto-increment and primary key - bug #1908719 [interface] New field cannot be auto-increment and primary key
- [dbi] Incorrect interpretation for some mysqli field flags
2.11.6.0 (not yet released) 2.11.6.0 (not yet released)
- bug #1903724 [interface] Displaying of very large queries in error message - bug #1903724 [interface] Displaying of very large queries in error message

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

@@ -13,26 +13,6 @@ if (!defined('PMA_MYSQL_CLIENT_API')) {
unset($client_api); unset($client_api);
} }
// Constants from mysql_com.h of MySQL 4.1.3
/**
* @deprecated
define('NOT_NULL_FLAG', MYSQLI_NOT_NULL_FLAG);
define('PRI_KEY_FLAG', MYSQLI_PRI_KEY_FLAG);
define('UNIQUE_KEY_FLAG', MYSQLI_UNIQUE_KEY_FLAG);
define('MULTIPLE_KEY_FLAG', MYSQLI_MULTIPLE_KEY_FLAG);
define('BLOB_FLAG', MYSQLI_BLOB_FLAG);
define('UNSIGNED_FLAG', MYSQLI_UNSIGNED_FLAG);
define('ZEROFILL_FLAG', MYSQLI_ZEROFILL_FLAG);
define('BINARY_FLAG', MYSQLI_BINARY_FLAG);
define('ENUM_FLAG', MYSQLI_TYPE_ENUM);
define('AUTO_INCREMENT_FLAG', MYSQLI_AUTO_INCREMENT_FLAG);
define('TIMESTAMP_FLAG', MYSQLI_TIMESTAMP_FLAG);
define('SET_FLAG', MYSQLI_SET_FLAG);
define('NUM_FLAG', MYSQLI_NUM_FLAG);
define('PART_KEY_FLAG', MYSQLI_PART_KEY_FLAG);
define('UNIQUE_FLAG', MYSQLI_UNIQUE_FLAG);
*/
/** /**
* some older mysql client libs are missing this constants ... * some older mysql client libs are missing this constants ...
*/ */
@@ -599,17 +579,20 @@ function PMA_DBI_field_name($result, $i)
*/ */
function PMA_DBI_field_flags($result, $i) function PMA_DBI_field_flags($result, $i)
{ {
// This is missing from PHP 5.2.5, see http://bugs.php.net/bug.php?id=44846
if (! defined('MYSQLI_ENUM_FLAG')) {
define('MYSQLI_ENUM_FLAG', 256); // see MySQL source include/mysql_com.h
}
$f = mysqli_fetch_field_direct($result, $i); $f = mysqli_fetch_field_direct($result, $i);
$f = $f->flags; $f = $f->flags;
$flags = ''; $flags = '';
if ($f & MYSQLI_UNIQUE_KEY_FLAG) { $flags .= 'unique ';} if ($f & MYSQLI_UNIQUE_KEY_FLAG) { $flags .= 'unique ';}
if ($f & MYSQLI_NUM_FLAG) { $flags .= 'num ';} if ($f & MYSQLI_NUM_FLAG) { $flags .= 'num ';}
if ($f & MYSQLI_PART_KEY_FLAG) { $flags .= 'part_key ';} if ($f & MYSQLI_PART_KEY_FLAG) { $flags .= 'part_key ';}
if ($f & MYSQLI_TYPE_SET) { $flags .= 'set ';} if ($f & MYSQLI_SET_FLAG) { $flags .= 'set ';}
if ($f & MYSQLI_TIMESTAMP_FLAG) { $flags .= 'timestamp ';} if ($f & MYSQLI_TIMESTAMP_FLAG) { $flags .= 'timestamp ';}
if ($f & MYSQLI_AUTO_INCREMENT_FLAG) { $flags .= 'auto_increment ';} if ($f & MYSQLI_AUTO_INCREMENT_FLAG) { $flags .= 'auto_increment ';}
if ($f & MYSQLI_TYPE_ENUM) { $flags .= 'enum ';} if ($f & MYSQLI_ENUM_FLAG) { $flags .= 'enum ';}
// @TODO seems to be outdated
if ($f & MYSQLI_BINARY_FLAG) { $flags .= 'binary ';} if ($f & MYSQLI_BINARY_FLAG) { $flags .= 'binary ';}
if ($f & MYSQLI_ZEROFILL_FLAG) { $flags .= 'zerofill ';} if ($f & MYSQLI_ZEROFILL_FLAG) { $flags .= 'zerofill ';}
if ($f & MYSQLI_UNSIGNED_FLAG) { $flags .= 'unsigned ';} if ($f & MYSQLI_UNSIGNED_FLAG) { $flags .= 'unsigned ';}