database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-04 17:23:46 +03:00
Code Activity

refs #5511 include unsigned float in our type comparitor

Browse Source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@48778 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska
2013-04-17 00:02:15 -04:00
committed by Yoni Fogel
parent a456fd2e94
commit e14d76c021
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/tokudb/hatoku_cmp.cc
View File

@@ -2913,22 +2913,22 @@ bool fields_are_same_type(
#endif #endif
{ {
TOKU_TYPE toku_type = mysql_to_toku_type(a); TOKU_TYPE toku_type = mysql_to_toku_type(a);
if (toku_type == toku_type_int) { if ((toku_type == toku_type_int || toku_type == toku_type_float) &&
if ( ((a->flags & UNSIGNED_FLAG) == 0) != ((b->flags & UNSIGNED_FLAG) == 0) ) { (a->flags & UNSIGNED_FLAG) != (b->flags & UNSIGNED_FLAG)) {
retval = false; retval = false;
goto cleanup; goto cleanup;
} }
if ((a->flags & AUTO_INCREMENT_FLAG) != (b->flags & AUTO_INCREMENT_FLAG)) { if (toku_type == toku_type_int &&
(a->flags & AUTO_INCREMENT_FLAG) != (b->flags & AUTO_INCREMENT_FLAG)) {
retval = false; retval = false;
goto cleanup; goto cleanup;
} }
}
if (a->pack_length() != b->pack_length()) { if (a->pack_length() != b->pack_length()) {
retval = false; retval = false;
goto cleanup; goto cleanup;
} }
}
break; break;
}
case MYSQL_TYPE_TINY_BLOB: case MYSQL_TYPE_TINY_BLOB:
case MYSQL_TYPE_MEDIUM_BLOB: case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_BLOB: case MYSQL_TYPE_BLOB: