summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@oracle.com>2011-11-29 22:30:04 +0200
committerAndrei Elkin <andrei.elkin@oracle.com>2011-11-29 22:30:04 +0200
commitb1e283a4b17bb008572e484e6a6dac3a9f00635c (patch)
tree5401e21ec849416d357a9b877491b848b10a2344 /sql/sql_lex.h
parent9937d5f0a91bb8fdceb7d2110e22c03878242a29 (diff)
downloadmariadb-git-b1e283a4b17bb008572e484e6a6dac3a9f00635c.tar.gz
reverting the initial patch for bug#13437900 for refinement.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 474fa87495b..542e8b42ae2 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -291,9 +291,7 @@ typedef struct st_lex_master_info
char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher;
char *relay_log_name;
ulong relay_log_pos;
- bool repl_ignore_server_ids_inited;
DYNAMIC_ARRAY repl_ignore_server_ids;
- typeof(::server_id) repl_ignore_server_ids_static_buffer[4];
} LEX_MASTER_INFO;
typedef struct st_lex_reset_slave
@@ -2457,11 +2455,6 @@ struct LEX: public Query_tables_list
destroy_query_tables_list();
plugin_unlock_list(NULL, (plugin_ref *)plugins.buffer, plugins.elements);
delete_dynamic(&plugins);
- if (mi.repl_ignore_server_ids_inited)
- {
- delete_dynamic(&mi.repl_ignore_server_ids);
- mi.repl_ignore_server_ids_inited= false;
- }
}
inline bool is_ps_or_view_context_analysis()