Merge branch 'mysql-8.0' into mysql-trunk

mayprasa · mayprasa · commit 2edcf88b7ecf · 2017-10-12T15:08:23.000+05:30
diff --git a/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.cc b/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.cc
@@ -792,6 +792,7 @@ innodb_conn_clean(
 	void*			thd = NULL;
 
 	if (clear_all) {
+		my_thread_init();
 		thd = handler_create_thd(engine->enable_binlog);
 	}
 
@@ -865,6 +866,7 @@ innodb_conn_clean(
 	if (thd) {
 		handler_thd_attach(thd, NULL);
 		handler_close_thd(thd);
+		my_thread_end();
 	}
 
 	return(num_freed);

Original file line number	Diff line number	Diff line change
`@@ -792,6 +792,7 @@ innodb_conn_clean(`
`792`	`792`	`void* thd = NULL;`
`793`	`793`
`794`	`794`	`if (clear_all) {`
	`795`	`+ my_thread_init();`
`795`	`796`	`thd = handler_create_thd(engine->enable_binlog);`
`796`	`797`	`}`
`797`	`798`
`@@ -865,6 +866,7 @@ innodb_conn_clean(`
`865`	`866`	`if (thd) {`
`866`	`867`	`handler_thd_attach(thd, NULL);`
`867`	`868`	`handler_close_thd(thd);`
	`869`	`+ my_thread_end();`
`868`	`870`	`}`
`869`	`871`
`870`	`872`	`return(num_freed);`