diff options
| author | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
| commit | afbe601302fc59c498437321b296ed6c8d360564 (patch) | |
| tree | 23bcc9a71fe7237887a111b158e30f5a6bb665d3 /sql/repl_failsafe.cc | |
| parent | 67456bb970cc949ceb5779b230592e455843c35c (diff) | |
| parent | 541883f9d89a8d38affba60bf9506289a6232da1 (diff) | |
| download | mariadb-git-afbe601302fc59c498437321b296ed6c8d360564.tar.gz | |
merge with 4.1
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 10ff5fa3596..dc23b014e31 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -14,8 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -// Sasha Pachev <sasha@mysql.com> is currently in charge of this file - #include "mysql_priv.h" #ifdef HAVE_REPLICATION @@ -37,7 +35,7 @@ HASH slave_list; const char *rpl_role_type[] = {"MASTER","SLAVE",NullS}; TYPELIB rpl_role_typelib = {array_elements(rpl_role_type)-1,"", - rpl_role_type}; + rpl_role_type, NULL}; const char* rpl_status_type[]= { @@ -45,7 +43,7 @@ const char* rpl_status_type[]= "RECOVERY_CAPTAIN","NULL",NullS }; TYPELIB rpl_status_typelib= {array_elements(rpl_status_type)-1,"", - rpl_status_type}; + rpl_status_type, NULL}; static Slave_log_event* find_slave_event(IO_CACHE* log, |