Fixed sysvars_server_embedded test result to reflect new values for

query_prealloc_size, query_alloc_block_size and log_tc_size.

Fixed incorrect registration of LOCK_binlog_end_pos in PFS.

mysql-test/suite/perfschema/r/relaylog.result

@@ -63,6 +63,7 @@ where event_name like "%MYSQL_BIN_LOG%"
 EVENT_NAME	COUNT_STAR
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy	NONE
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread	MANY
+wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list	MANY
 "Expect no slave relay log"
@@ -141,6 +142,7 @@ where event_name like "%MYSQL_BIN_LOG%"
 EVENT_NAME	COUNT_STAR
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy	NONE
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread	MANY
+wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list	MANY
 "Expect a slave relay log"

mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff

@@ -1228,3 +1228,12 @@
  VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
+@@ -4897,7 +4897,7 @@
+ VARIABLE_NAME	LOG_TC_SIZE
+ GLOBAL_VALUE_ORIGIN	AUTO
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Size of transaction coordinator log.
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	YES

mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

@@ -18,7 +18,7 @@ variable_name not in (
 'system_time_zone',
 'version_comment',
 'version_compile_machine', 'version_compile_os',
-'version_malloc_library', 'version'
+'version_malloc_library', 'log_tc_size', 'version'
         )
 order by variable_name;
 VARIABLE_NAME	AUTOCOMMIT
@@ -2948,10 +2948,10 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	QUERY_ALLOC_BLOCK_SIZE
-SESSION_VALUE	8192
-GLOBAL_VALUE	8192
+SESSION_VALUE	16384
+GLOBAL_VALUE	16384
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	8192
+DEFAULT_VALUE	16384
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Allocation block size for query parsing and execution
@@ -3046,14 +3046,14 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	QUERY_PREALLOC_SIZE
-SESSION_VALUE	8192
-GLOBAL_VALUE	8192
+SESSION_VALUE	24576
+GLOBAL_VALUE	24576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	8192
+DEFAULT_VALUE	24576
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Persistent buffer for query parsing and execution
-NUMERIC_MIN_VALUE	8192
+NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
@@ -4159,4 +4159,19 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
+select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE,
+VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
+from information_schema.system_variables
+where variable_name in (
+'log_tc_size'
+        )
+order by variable_name;
+VARIABLE_NAME	LOG_TC_SIZE
+GLOBAL_VALUE_ORIGIN	AUTO
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Size of transaction coordinator log.
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 set global div_precision_increment=default;

mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff

@@ -1251,3 +1251,12 @@
  VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
+@@ -4897,7 +4897,7 @@
+ VARIABLE_NAME	LOG_TC_SIZE
+ GLOBAL_VALUE_ORIGIN	AUTO
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Size of transaction coordinator log.
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	YES

mysql-test/t/AAA.test

+SELECT 1;

sql/log.h

@@ -428,9 +428,6 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG
   PSI_file_key m_key_file_log_index;
 
   PSI_file_key m_key_COND_queue_busy;
-
-  /** The instrumentation key to use for @ LOCK_binlog_end_pos */
-  PSI_mutex_key m_key_LOCK_binlog_end_pos;
 #endif
 
   struct group_commit_entry

sql/mysqld.cc

@@ -861,6 +861,7 @@ PSI_mutex_key key_LOCK_des_key_file;
 
 PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list,
   key_BINLOG_LOCK_binlog_background_thread,
+  m_key_LOCK_binlog_end_pos,
   key_delayed_insert_mutex, key_hash_filo_lock, key_LOCK_active_mi,
   key_LOCK_connection_count, key_LOCK_crypt, key_LOCK_delayed_create,
   key_LOCK_delayed_insert, key_LOCK_delayed_status, key_LOCK_error_log,
@@ -912,6 +913,7 @@ static PSI_mutex_info all_server_mutexes[]=
   { &key_BINLOG_LOCK_index, "MYSQL_BIN_LOG::LOCK_index", 0},
   { &key_BINLOG_LOCK_xid_list, "MYSQL_BIN_LOG::LOCK_xid_list", 0},
   { &key_BINLOG_LOCK_binlog_background_thread, "MYSQL_BIN_LOG::LOCK_binlog_background_thread", 0},
+  { &m_key_LOCK_binlog_end_pos, "MYSQL_BIN_LOG::LOCK_binlog_end_pos", 0 },
   { &key_RELAYLOG_LOCK_index, "MYSQL_RELAY_LOG::LOCK_index", 0},
   { &key_delayed_insert_mutex, "Delayed_insert::mutex", 0},
   { &key_hash_filo_lock, "hash_filo::lock", 0},

sql/mysqld.h

@@ -249,6 +249,7 @@ extern PSI_mutex_key key_LOCK_des_key_file;
 
 extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list,
   key_BINLOG_LOCK_binlog_background_thread,
+  m_key_LOCK_binlog_end_pos,
   key_delayed_insert_mutex, key_hash_filo_lock, key_LOCK_active_mi,
   key_LOCK_connection_count, key_LOCK_crypt, key_LOCK_delayed_create,
   key_LOCK_delayed_insert, key_LOCK_delayed_status, key_LOCK_error_log,