3401 hery.ramilison@stripped 2011-08-29
Applying patch from vasil.dimov@stripped for OS X build failure
modified:
storage/innobase/include/ut0crc32.h
storage/innobase/ut/ut0crc32.c
3400 Evgeny Potemkin 2011-08-24 {clone-5.6.3-m5-build} [merge]
Auto-merge.
modified:
mysql-test/suite/perfschema/include/socket_summary_check.inc
mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
storage/innobase/dict/dict0stats.c
storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/include/ut0crc32.h'
--- a/storage/innobase/include/ut0crc32.h 2011-08-22 07:46:51 +0000
+++ b/storage/innobase/include/ut0crc32.h 2011-08-29 19:06:57 +0000
@@ -40,7 +40,7 @@ ut_crc32_init();
Calculates CRC32.
@return CRC32 (CRC-32C, using the GF(2) primitive polynomial 0x11EDC6F41,
or 0x1EDC6F41 without the high-order bit) */
-UNIV_INTERN
+extern
ib_uint32_t
(*ut_crc32)(
/*========*/
=== modified file 'storage/innobase/ut/ut0crc32.c'
--- a/storage/innobase/ut/ut0crc32.c 2011-08-22 07:46:51 +0000
+++ b/storage/innobase/ut/ut0crc32.c 2011-08-29 19:06:57 +0000
@@ -93,6 +93,16 @@ static ibool ut_crc32_slice8_table_init
static ibool ut_crc32_sse2_enabled = FALSE;
/********************************************************************//**
+Calculates CRC32.
+@return CRC32 (CRC-32C, using the GF(2) primitive polynomial 0x11EDC6F41,
+or 0x1EDC6F41 without the high-order bit) */
+ib_uint32_t
+(*ut_crc32)(
+/*========*/
+ const byte* buf, /*!< in: data over which to calculate CRC32 */
+ ulint len); /*!< in: data length */
+
+/********************************************************************//**
Initializes the table that is used to generate the CRC32 if the CPU does
not have support for it. */
static
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (hery.ramilison:3400 to 3401) | Hery Ramilison | 29 Aug |
