summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorSven Sandberg <sven.sandberg@oracle.com>2011-02-16 17:27:35 +0100
committerSven Sandberg <sven.sandberg@oracle.com>2011-02-16 17:27:35 +0100
commitd4674ca897a3173ef58354b0697ff47689d03ca3 (patch)
treed8cc39cc890b2d2af8859e9cbef52e17542bdaad /sql/sql_lex.h
parent4a348c56567f09838aaff8091b000561d5106de5 (diff)
downloadmariadb-git-d4674ca897a3173ef58354b0697ff47689d03ca3.tar.gz
WL#5670: Proposal: Remove SHOW NEW MASTER statement
Removes SHOW NEW MASTER statement and all related code. Also removes the unused function update_slave_list from repl_failsafe.cc.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 2d11bc7aad7..a9abe174d6e 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -162,7 +162,7 @@ enum enum_sql_command {
SQLCOM_SHOW_OPEN_TABLES,
SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ,
SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_DELETE_MULTI, SQLCOM_UPDATE_MULTI,
- SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, SQLCOM_DO,
+ SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_DO,
SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS,
SQLCOM_SHOW_STORAGE_ENGINES, SQLCOM_SHOW_PRIVILEGES,
SQLCOM_HELP, SQLCOM_CREATE_USER, SQLCOM_DROP_USER, SQLCOM_RENAME_USER,
@@ -269,8 +269,7 @@ typedef struct st_lex_server_options
/**
- Structure to hold parameters for CHANGE MASTER or START/STOP SLAVE
- or SHOW NEW MASTER.
+ Structure to hold parameters for CHANGE MASTER, START SLAVE, and STOP SLAVE.
Remark: this should not be confused with Master_info (and perhaps
would better be renamed to st_lex_replication_info). Some fields,