mirror of
https://github.com/MariaDB/server.git
synced 2025-12-03 05:41:09 +03:00
refs #5511 include unsigned float in our type comparitor
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@48778 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
committed by
Yoni Fogel
parent
a456fd2e94
commit
e14d76c021
@@ -2913,22 +2913,22 @@ bool fields_are_same_type(
|
||||
#endif
|
||||
{
|
||||
TOKU_TYPE toku_type = mysql_to_toku_type(a);
|
||||
if (toku_type == toku_type_int) {
|
||||
if ( ((a->flags & UNSIGNED_FLAG) == 0) != ((b->flags & UNSIGNED_FLAG) == 0) ) {
|
||||
retval = false;
|
||||
goto cleanup;
|
||||
}
|
||||
if ((a->flags & AUTO_INCREMENT_FLAG) != (b->flags & AUTO_INCREMENT_FLAG)) {
|
||||
retval = false;
|
||||
goto cleanup;
|
||||
}
|
||||
if ((toku_type == toku_type_int || toku_type == toku_type_float) &&
|
||||
(a->flags & UNSIGNED_FLAG) != (b->flags & UNSIGNED_FLAG)) {
|
||||
retval = false;
|
||||
goto cleanup;
|
||||
}
|
||||
if (toku_type == toku_type_int &&
|
||||
(a->flags & AUTO_INCREMENT_FLAG) != (b->flags & AUTO_INCREMENT_FLAG)) {
|
||||
retval = false;
|
||||
goto cleanup;
|
||||
}
|
||||
if (a->pack_length() != b->pack_length()) {
|
||||
retval = false;
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case MYSQL_TYPE_TINY_BLOB:
|
||||
case MYSQL_TYPE_MEDIUM_BLOB:
|
||||
case MYSQL_TYPE_BLOB:
|
||||
|
||||
Reference in New Issue
Block a user