Code cleanups during code reviews

Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index 2fd603d9381..d8e93f1fd14 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -82,7 +82,7 @@ public:
     if (sizeof(buffer) >= 8)
       return uint8korr(buffer);
     DBUG_ASSERT(sizeof(buffer) >= 4);
-    uint4korr(buffer);
+    return (ulonglong) uint4korr(buffer);
   }
 };