diff options
author | ndbdev@dl145b.mysql.com <> | 2005-06-06 23:39:19 +0200 |
---|---|---|
committer | ndbdev@dl145b.mysql.com <> | 2005-06-06 23:39:19 +0200 |
commit | 161a58ab4b3ef4fbd676fcaa7aa355e47b710288 (patch) | |
tree | 3e200670a1d4a22fc6e563ac52a7347f5946d3e7 /sql/sql_bitmap.h | |
parent | d316bc88d805008606c5635d2e84ce020118f7d7 (diff) | |
parent | 8c94b5fba7f6e5518616615da63c8029c5790aea (diff) | |
download | mariadb-git-161a58ab4b3ef4fbd676fcaa7aa355e47b710288.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 758d7674f9d..00f38895fd6 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); } }; |