[Commits] 4f2bccf: # This is a combination of 4 commits.

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


revision-id: 4f2bccf266fbb6f50a3a81074905ed87d93aebdd (mariadb-10.2.1-6-g4f2bccf)
parent(s): 07e8986892e8a7e106f0365470716a3447fc457b
committer: Jan Lindström
timestamp: 2016-09-08 15:46:01 +0300
message:

# This is a combination of 4 commits.
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

Merge InnoDB 5.7 from mysql-5.7.14.

# This is the 2nd commit message:

Fix Windows compiler errors.

# This is the 2nd commit message:

Fixed crash on buffer_pool_resize() test case sys_vars.innodb-buffer-pool-resize-basic.test
accidentally created two threads for resize.

# This is the 3rd commit message:

Fixed compiler error if INT64_MAX and INT64_MIN are not defined
and fixed test case failure on innodb-mdev-7513.

# This is the 4th commit message:

Fix double free of srv_sys and fix test case failure.

---
 storage/innobase/btr/btr0cur.cc       |  4 ++--
 storage/innobase/handler/ha_innodb.cc |  1 -
 storage/innobase/include/os0atomic.h  | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
index 7daec06..5ebb6a0 100644
--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@@ -3939,7 +3939,7 @@ btr_cur_update_in_place(
 	{
 		rec_printer p(rec, offsets);
 		DBUG_PRINT("ib_cur", ("update-in-place %s (" IB_ID_FMT ") by "IB_ID_FMT ": %s",
-				index->name(), index->id, trx_id,
+				index->name(), (ulint)index->id, trx_id,
 				p.str().c_str()));
 	}
 #endif
@@ -4987,7 +4987,7 @@ btr_cur_del_mark_set_clust_rec(
 	{
 		rec_printer p(rec, offsets);
 		DBUG_PRINT("ib_cur", ("delete-mark clust %s (" IB_ID_FMT ") by " IB_ID_FMT ": %s",
-				index->table_name, index->id,
+				index->table_name, (ulint)index->id,
 				trx_get_id_for_print(trx),
 				p.str().c_str()));
 	}
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