[Commits] 2ee84dc: Merge InnoDB 5.7 from mysql-5.7.14.

Jan Lindström jan.lindstrom at mariadb.com
Thu Sep 8 15:47:24 EEST 2016


revision-id: 2ee84dc163497fece8d771e843b9cf94282394e4 (mariadb-10.2.1-6-g2ee84dc)
parent(s): 07e8986892e8a7e106f0365470716a3447fc457b
committer: Jan Lindström
timestamp: 2016-09-08 15:46:59 +0300
message:

Merge InnoDB 5.7 from mysql-5.7.14.

MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
fix main.innodb_mysql_sync - re-enable online alter for partitioned innodb tables

---
 storage/innobase/handler/ha_innodb.cc |  1 -
 storage/innobase/include/os0atomic.h  | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 16f3001..9615e7f 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -12512,7 +12512,6 @@ create_table_info_t::create_table_def()
 	on re-start we don't need to restore temp-table and so no entry is
 	needed in SYSTEM tables. */
 	if (dict_table_is_temporary(table)) {
-
 #ifdef MYSQL_COMPRESSION
 		if (m_create_info->compress.length > 0) {
 			push_warning_printf(
diff --git a/storage/innobase/include/os0atomic.h b/storage/innobase/include/os0atomic.h
index 4b362e7..7ac429c 100644
--- a/storage/innobase/include/os0atomic.h
+++ b/storage/innobase/include/os0atomic.h
@@ -229,10 +229,10 @@ bool
 os_compare_and_swap_ulint(volatile ulint* ptr, ulint old_val, ulint new_val)
 {
 #ifdef HAVE_IB_GCC_ATOMIC_SEQ_CST
-  return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
-                                     __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+	return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
+		__ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
 #else
-  return __sync_bool_compare_and_swap(ptr, old_val, new_val);
+	return __sync_bool_compare_and_swap(ptr, old_val, new_val);
 #endif
 }
 
@@ -241,10 +241,10 @@ bool
 os_compare_and_swap_lint(volatile lint* ptr, lint old_val, lint new_val)
 {
 #ifdef HAVE_IB_GCC_ATOMIC_SEQ_CST
-  return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
+	return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
 				     __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
 #else
-  return __sync_bool_compare_and_swap(ptr, old_val, new_val);
+	return __sync_bool_compare_and_swap(ptr, old_val, new_val);
 #endif
 }
 
@@ -253,10 +253,10 @@ bool
 os_compare_and_swap_uint32(volatile ib_uint32_t* ptr, ib_uint32_t old_val, ib_uint32_t new_val)
 {
 #ifdef HAVE_IB_GCC_ATOMIC_SEQ_CST
-  return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
-                                     __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+	return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
+			__ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
 #else
-  return __sync_bool_compare_and_swap(ptr, old_val, new_val);
+	return __sync_bool_compare_and_swap(ptr, old_val, new_val);
 #endif
 }
 
@@ -272,10 +272,10 @@ bool
 os_compare_and_swap_thread_id(volatile os_thread_id_t* ptr, os_thread_id_t old_val, os_thread_id_t new_val)
 {
 #ifdef HAVE_IB_GCC_ATOMIC_SEQ_CST
-  return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
-                                     __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+	return __atomic_compare_exchange_n(ptr, &old_val, new_val, 0,
+			__ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
 #else
-  return __sync_bool_compare_and_swap(ptr, old_val, new_val);
+	return __sync_bool_compare_and_swap(ptr, old_val, new_val);
 #endif
 }
 #endif /* HAVE_GCC_SYNC_BUILTINS */


More information about the commits mailing list