[Commits] 00ea988: Merge InnoDB 5.7 from mysql-5.7.14.

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


revision-id: 00ea988ada02a19e4b3daecd4686e74de35d4c7b (mariadb-10.2.1-6-g00ea988)
parent(s): 07e8986892e8a7e106f0365470716a3447fc457b
committer: Jan Lindström
timestamp: 2016-09-08 15:45:26 +0300
message:

Merge InnoDB 5.7 from mysql-5.7.14.

---
 mysql-test/suite/innodb/r/innodb-mdev-7513.result |  2 ++
 mysql-test/suite/innodb/t/innodb-mdev-7513.test   |  4 ++++
 storage/innobase/btr/btr0cur.cc                   |  4 ++--
 storage/innobase/handler/ha_innodb.cc             |  3 +--
 storage/innobase/include/os0atomic.h              | 22 +++++++++++-----------
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/mysql-test/suite/innodb/r/innodb-mdev-7513.result b/mysql-test/suite/innodb/r/innodb-mdev-7513.result
index 55b4d34..91d6447 100644
--- a/mysql-test/suite/innodb/r/innodb-mdev-7513.result
+++ b/mysql-test/suite/innodb/r/innodb-mdev-7513.result
@@ -1,5 +1,6 @@
 call mtr.add_suppression("InnoDB: Cannot add field `.* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page.");
 call mtr.add_suppression("Row size too large (> 8126)*");
+set GLOBAL innodb_strict_mode=OFF;
 CREATE TABLE t1 ( text1 TEXT,
 text2 TEXT,
 text3 TEXT,
@@ -202,4 +203,5 @@ INSERT INTO t1 VALUES ('abcdef', 'abcdef', 'abcdef', 'abcdef', 'abcdef', 'abcdef
 DELETE FROM t1 WHERE text1 = 'abcdef';
 SELECT * from t1;
 text1	text2	text3	text4	text5	text6	text7	text8	text9	text10	text11	text12	text13	text14	text15	text16	text17	text18	text19	text20	text21	text22	text23	text24	text25	text26	text27	text28	text29	text30	text31	text32	text33	text34	text35	text36	text37	text38	text39	text40	text41	text42	text43	text44	text45	text46	text47	text48	text49	text50	text51	text52	text53	text54	text55	text56	text57	text58	text59	text60	text61	text62	text63	text64	text65	text66	text67	text68	text69	text70	text71	text72	text73	text74	text75	text76	text77	text78	text79	text80	text81	text82	text83	text84	text85	text86	text87	text88	text89	text90	text91	text92	text93	text94	text95	text96	text97	text98	text99	text100	text101	text102	text103	text104	text105	text106	text107	text108	text109	text110	text111	text112	text113	text114	text115	text116	text117	text118	text119	text120	text121	text122	text123	text124	text125	text126	text127	text128	text129	text130	text131	text132	text133	text134	text135	text136	text137	t
 ext138	text139	text140	text141	text142	text143	text144	text145	text146	text147	text148	text149	text150	text151	text152	text153	text154	text155	text156	text157	text158	text159	text160	text161	text162	text163	text164	text165	text166	text167	text168	text169	text170	text171	text172	text173	text174	text175	text176	text177	text178	text179	text180	text181	text182	text183	text184	text185	text186	text187	text188	text189	text190	text191	text192	text193	text194	text195	text196	text197
+set GLOBAL innodb_strict_mode=DEFAULT;
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/innodb-mdev-7513.test b/mysql-test/suite/innodb/t/innodb-mdev-7513.test
index 88f941e..cc2e7a9 100644
--- a/mysql-test/suite/innodb/t/innodb-mdev-7513.test
+++ b/mysql-test/suite/innodb/t/innodb-mdev-7513.test
@@ -6,6 +6,8 @@
 call mtr.add_suppression("InnoDB: Cannot add field `.* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page.");
 call mtr.add_suppression("Row size too large (> 8126)*");
 
+set GLOBAL innodb_strict_mode=OFF;
+
 --disable_warnings
 CREATE TABLE t1 ( text1 TEXT,
 text2 TEXT,
@@ -217,5 +219,7 @@ DELETE FROM t1 WHERE text1 = 'abcdef';
 SELECT * from t1;
 --enable_warnings
 
+set GLOBAL innodb_strict_mode=DEFAULT;
+
 DROP TABLE t1;
 
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..595959f 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -4438,7 +4438,7 @@ innobase_init(
 
 			sql_print_error("InnoDB: wrong innodb_file_format.");
 
-			DBUG_RETURN(innobase_init_abort());
+		DBUG_RETURN(innobase_init_abort());
 		}
 	} else {
 		/* Set it to the default file format id. Though this
@@ -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