diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-09 09:12:32 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-09 09:12:32 +0200 |
| commit | c6017b77e0d2bf2f5b610317b95646e45fa13496 (patch) | |
| tree | d68f62325b4fa8ab40d3d3e7da39347a2fab76ac /storage | |
| parent | 64d29c6575d8c9ef01a2e1d075d434bc0114b39f (diff) | |
| download | mariadb-git-c6017b77e0d2bf2f5b610317b95646e45fa13496.tar.gz | |
Address my review comments in the contributed patch.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/ut0crc32.h | 3 | ||||
| -rw-r--r-- | storage/innobase/ut/ut0crc32.cc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/storage/innobase/include/ut0crc32.h b/storage/innobase/include/ut0crc32.h index 712f1b92d46..36b389b5bd2 100644 --- a/storage/innobase/include/ut0crc32.h +++ b/storage/innobase/include/ut0crc32.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2016, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -54,6 +55,6 @@ extern ut_crc32_func_t ut_crc32_legacy_big_endian; but very slow). */ extern ut_crc32_func_t ut_crc32_byte_by_byte; -extern const char *ut_crc32_implementation; +extern const char* ut_crc32_implementation; #endif /* ut0crc32_h */ diff --git a/storage/innobase/ut/ut0crc32.cc b/storage/innobase/ut/ut0crc32.cc index cf2a2407707..386d32f6a60 100644 --- a/storage/innobase/ut/ut0crc32.cc +++ b/storage/innobase/ut/ut0crc32.cc @@ -2,6 +2,7 @@ Copyright (c) 2009, 2010 Facebook, Inc. All Rights Reserved. Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2016, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -97,7 +98,7 @@ but very slow). */ ut_crc32_func_t ut_crc32_byte_by_byte; /** Text description of CRC32 implementation */ -const char *ut_crc32_implementation = NULL; +const char* ut_crc32_implementation; /** Swap the byte order of an 8 byte integer. @param[in] i 8-byte integer @@ -731,7 +732,7 @@ ut_crc32_init() */ - if ((features_ecx >> 20) & 1) { + if (features_ecx & 1 << 20) { ut_crc32 = ut_crc32_hw; ut_crc32_legacy_big_endian = ut_crc32_legacy_big_endian_hw; ut_crc32_byte_by_byte = ut_crc32_byte_by_byte_hw; |