Skip to content
Permalink
Browse files

Merge 10.1 into 10.2

  • Loading branch information...
dr-m committed Jul 23, 2019
2 parents 3bcda8a + 1f498f9 commit 058c385e0356c21a0dd2280eaddcf604c04ae48c
@@ -1214,8 +1214,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.44
+GLOBAL_VALUE 5.6.43-84.3
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.44-86.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
@@ -684,8 +684,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.44
+GLOBAL_VALUE 5.6.43-84.3
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.44-86.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
@@ -716,23 +716,6 @@ ut_crc32_init()
ut_cpuid(vend, &model, &family, &stepping,
&features_ecx, &features_edx);

/* Valgrind does not understand the CRC32 instructions:
vex amd64->IR: unhandled instruction bytes: 0xF2 0x48 0xF 0x38 0xF0 0xA
valgrind: Unrecognised instruction at address 0xad3db5.
Your program just tried to execute an instruction that Valgrind
did not recognise. There are two possible reasons for this.
1. Your program has a bug and erroneously jumped to a non-code
location. If you are running Memcheck and you just saw a
warning about a bad jump, it's probably your program's fault.
2. The instruction is legitimate but Valgrind doesn't handle it,
i.e. it's Valgrind's fault. If you think this is the case or
you are not sure, please let us know and we'll try to fix it.
Either way, Valgrind will now raise a SIGILL signal which will
probably kill your program.
*/

if (features_ecx & 1 << 20) {
ut_crc32 = ut_crc32_hw;
#ifdef INNODB_BUG_ENDIAN_CRC32
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
Copyright (c) 2017, 2019, 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
@@ -154,12 +154,7 @@ ut_time_us(
/*=======*/
uintmax_t* tloc) /*!< out: us since epoch, if non-NULL */
{
struct timeval tv;
uintmax_t us;

ut_gettimeofday(&tv, NULL);

us = static_cast<uintmax_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
uintmax_t us = my_interval_timer() / 1000;

if (tloc != NULL) {
*tloc = us;
@@ -177,11 +172,7 @@ ulint
ut_time_ms(void)
/*============*/
{
struct timeval tv;

ut_gettimeofday(&tv, NULL);

return((ulint) tv.tv_sec * 1000 + tv.tv_usec / 1000);
return static_cast<ulint>(my_interval_timer() / 1000000);
}

/**********************************************************//**
@@ -45,10 +45,10 @@ Created 1/20/1994 Heikki Tuuri

#define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 6
#define INNODB_VERSION_BUGFIX 43
#define INNODB_VERSION_BUGFIX 44

#ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 84.3
#define PERCONA_INNODB_VERSION 86.0
#endif

/* Enable UNIV_LOG_ARCHIVE in XtraDB */
@@ -314,22 +314,6 @@ ut_crc32_init()
ut_cpuid(vend, &model, &family, &stepping,
&features_ecx, &features_edx);

/* Valgrind does not understand the CRC32 instructions:
vex amd64->IR: unhandled instruction bytes: 0xF2 0x48 0xF 0x38 0xF0 0xA
valgrind: Unrecognised instruction at address 0xad3db5.
Your program just tried to execute an instruction that Valgrind
did not recognise. There are two possible reasons for this.
1. Your program has a bug and erroneously jumped to a non-code
location. If you are running Memcheck and you just saw a
warning about a bad jump, it's probably your program's fault.
2. The instruction is legitimate but Valgrind doesn't handle it,
i.e. it's Valgrind's fault. If you think this is the case or
you are not sure, please let us know and we'll try to fix it.
Either way, Valgrind will now raise a SIGILL signal which will
probably kill your program.
*/
if ((features_ecx >> 20) & 1) {
ut_crc32 = ut_crc32_sse42;
ut_crc32_implementation = "Using SSE2 crc32 instructions";
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2019, 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
@@ -189,12 +190,7 @@ ut_time_us(
/*=======*/
ullint* tloc) /*!< out: us since epoch, if non-NULL */
{
struct timeval tv;
ullint us;

ut_gettimeofday(&tv, NULL);

us = (ullint) tv.tv_sec * 1000000 + tv.tv_usec;
ullint us = my_interval_timer() / 1000;

if (tloc != NULL) {
*tloc = us;
@@ -213,11 +209,7 @@ ulint
ut_time_ms(void)
/*============*/
{
struct timeval tv;

ut_gettimeofday(&tv, NULL);

return((ulint) tv.tv_sec * 1000 + tv.tv_usec / 1000);
return static_cast<ulint>(my_interval_timer() / 1000000);
}
#endif /* !UNIV_HOTBACKUP */

0 comments on commit 058c385

Please sign in to comment.
You can’t perform that action at this time.