diff options
author | monty@mysql.com <> | 2005-06-05 17:19:50 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2005-06-05 17:19:50 +0300 |
commit | 4b7882dc735fbc5a75c104c05bd544965fc4c485 (patch) | |
tree | e71cd25539c70e1d293ee75eda9bbe9defa7ff74 /sql/sql_bitmap.h | |
parent | 10f8d83dcb7637b3668fc42d85af9bdca44e9c60 (diff) | |
parent | 25a2c4a71eccb94b0311b9af60acbf8e85ad3db7 (diff) | |
download | mariadb-git-4b7882dc735fbc5a75c104c05bd544965fc4c485.tar.gz |
merge
Diffstat (limited to 'sql/sql_bitmap.h')
-rw-r--r-- | sql/sql_bitmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h index 958268fc314..bc1484b4fb0 100644 --- a/sql/sql_bitmap.h +++ b/sql/sql_bitmap.h @@ -81,7 +81,7 @@ public: if (sizeof(buffer) >= 8) return uint8korr(buffer); DBUG_ASSERT(sizeof(buffer) >= 4); - uint4korr(buffer); + return (ulonglong) uint4korr(buffer); } }; |