Fix that SHOW STATUS works with SSL. (0c0a170f) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+1 −0

Original line number	Diff line number	Diff line
		@@ -22819,6 +22819,7 @@ snapshot.
		listing of slaves currently registered with the master (Master)

		@item @code{SHOW SLAVE STATUS} @tab Provides status information on essential parameters of the slave thread. (Slave)

		@item @code{SHOW MASTER LOGS} @tab Only available starting in Version
		3.23.28. Lists the binary logs on the master. You should use this
		command prior to @code{PURGE MASTER LOGS TO} to find out how far you

mysql-test/r/innodb.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -900,7 +900,7 @@ explain select a,b,c from t1;
		table type possible_keys key key_len ref rows Extra
		t1 ALL NULL NULL NULL NULL 4
		drop table t1;
		create table t1 (testint int not null default 1);
		create table t1 (testint int not null default 1) type=innodb;
		desc t1;
		Field Type Null Key Default Extra
		testint int(11) 1

sql/mysqld.cc

+9 −1

Original line number	Diff line number	Diff line
		@@ -3147,16 +3147,21 @@ struct show_var_st status_vars[]= {
		{"Com_create_index", (char*) (com_stat+(uint) SQLCOM_CREATE_INDEX),SHOW_LONG},
		{"Com_create_table", (char*) (com_stat+(uint) SQLCOM_CREATE_TABLE),SHOW_LONG},
		{"Com_delete", (char*) (com_stat+(uint) SQLCOM_DELETE),SHOW_LONG},
		{"Com_delete_multi", (char*) (com_stat+(uint) SQLCOM_DELETE_MULTI),SHOW_LONG},
		{"Com_drop_db", (char*) (com_stat+(uint) SQLCOM_DROP_DB),SHOW_LONG},
		{"Com_drop_function", (char*) (com_stat+(uint) SQLCOM_DROP_FUNCTION),SHOW_LONG},
		{"Com_drop_index", (char*) (com_stat+(uint) SQLCOM_DROP_INDEX),SHOW_LONG},
		{"Com_drop_table", (char*) (com_stat+(uint) SQLCOM_DROP_TABLE),SHOW_LONG},
		{"Com_flush", (char*) (com_stat+(uint) SQLCOM_FLUSH),SHOW_LONG},
		{"Com_grant", (char*) (com_stat+(uint) SQLCOM_GRANT),SHOW_LONG},
		{"Com_ha_close", (char*) (com_stat+(uint) SQLCOM_HA_OPEN),SHOW_LONG},
		{"Com_ha_open", (char*) (com_stat+(uint) SQLCOM_HA_OPEN),SHOW_LONG},
		{"Com_ha_read", (char*) (com_stat+(uint) SQLCOM_HA_READ),SHOW_LONG},
		{"Com_insert", (char*) (com_stat+(uint) SQLCOM_INSERT),SHOW_LONG},
		{"Com_insert_select", (char*) (com_stat+(uint) SQLCOM_INSERT_SELECT),SHOW_LONG},
		{"Com_kill", (char*) (com_stat+(uint) SQLCOM_KILL),SHOW_LONG},
		{"Com_load", (char*) (com_stat+(uint) SQLCOM_LOAD),SHOW_LONG},
		{"Com_load_master_data", (char*) (com_stat+(uint) SQLCOM_LOAD_MASTER_DATA),SHOW_LONG},
		{"Com_load_master_table", (char*) (com_stat+(uint) SQLCOM_LOAD_MASTER_TABLE),SHOW_LONG},
		{"Com_lock_tables", (char*) (com_stat+(uint) SQLCOM_LOCK_TABLES),SHOW_LONG},
		{"Com_optimize", (char*) (com_stat+(uint) SQLCOM_OPTIMIZE),SHOW_LONG},
		@@ -3171,6 +3176,7 @@ struct show_var_st status_vars[]= {
		{"Com_rollback", (char*) (com_stat+(uint) SQLCOM_ROLLBACK),SHOW_LONG},
		{"Com_select", (char*) (com_stat+(uint) SQLCOM_SELECT),SHOW_LONG},
		{"Com_set_option", (char*) (com_stat+(uint) SQLCOM_SET_OPTION),SHOW_LONG},
		{"Com_show_binlog_events", (char*) (com_stat+(uint) SQLCOM_SHOW_BINLOG_EVENTS),SHOW_LONG},
		{"Com_show_binlogs", (char*) (com_stat+(uint) SQLCOM_SHOW_BINLOGS),SHOW_LONG},
		{"Com_show_create", (char*) (com_stat+(uint) SQLCOM_SHOW_CREATE),SHOW_LONG},
		{"Com_show_databases", (char*) (com_stat+(uint) SQLCOM_SHOW_DATABASES),SHOW_LONG},
		@@ -3178,9 +3184,11 @@ struct show_var_st status_vars[]= {
		{"Com_show_grants", (char*) (com_stat+(uint) SQLCOM_SHOW_GRANTS),SHOW_LONG},
		{"Com_show_keys", (char*) (com_stat+(uint) SQLCOM_SHOW_KEYS),SHOW_LONG},
		{"Com_show_logs", (char*) (com_stat+(uint) SQLCOM_SHOW_LOGS),SHOW_LONG},
		{"Com_show_master_STAT", (char*) (com_stat+(uint) SQLCOM_SHOW_MASTER_STAT),SHOW_LONG},
		{"Com_show_master_stat", (char*) (com_stat+(uint) SQLCOM_SHOW_MASTER_STAT),SHOW_LONG},
		{"Com_show_new_master", (char*) (com_stat+(uint) SQLCOM_SHOW_NEW_MASTER),SHOW_LONG},
		{"Com_show_open_tables", (char*) (com_stat+(uint) SQLCOM_SHOW_OPEN_TABLES),SHOW_LONG},
		{"Com_show_processlist", (char*) (com_stat+(uint) SQLCOM_SHOW_PROCESSLIST),SHOW_LONG},
		{"Com_show_slave_hosts", (char*) (com_stat+(uint) SQLCOM_SHOW_SLAVE_HOSTS),SHOW_LONG},
		{"Com_show_slave_stat", (char*) (com_stat+(uint) SQLCOM_SHOW_SLAVE_STAT),SHOW_LONG},
		{"Com_show_status", (char*) (com_stat+(uint) SQLCOM_SHOW_STATUS),SHOW_LONG},
		{"Com_show_tables", (char*) (com_stat+(uint) SQLCOM_SHOW_TABLES),SHOW_LONG},

sql/sql_lex.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ enum enum_sql_command {
		SQLCOM_RESET, SQLCOM_PURGE, SQLCOM_SHOW_BINLOGS,
		SQLCOM_SHOW_OPEN_TABLES, SQLCOM_LOAD_MASTER_DATA,
		SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ,
		SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_MULTI_DELETE,
		SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_DELETE_MULTI,
		SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER,
		SQLCOM_END
		};

sql/sql_parse.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1691,7 +1691,7 @@ mysql_execute_command(void)
		select_lex->options);
		break;
		}
		case SQLCOM_MULTI_DELETE:
		case SQLCOM_DELETE_MULTI:
		{
		TABLE_LIST aux_tables=(TABLE_LIST )thd->lex.auxilliary_table_list.first;
		TABLE_LIST *auxi;