diff options
| author | Monty <monty@mariadb.org> | 2016-08-21 20:14:13 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-08-21 20:14:13 +0300 |
| commit | 8d5a0d650b123e963d5fead2424783a9b52da395 (patch) | |
| tree | 7c12722ba264d3459f3ec85f4d1aa0ba5c5ee81f /sql/slave.cc | |
| parent | 05f61ba46046ca835071a73b9255e787dcce9255 (diff) | |
| download | mariadb-git-8d5a0d650b123e963d5fead2424783a9b52da395.tar.gz | |
Cleanups and minor fixes
- Fixed typos
- Added --core-on-failure to mysql-test-run
- More DBUG_PRINT in viosocket.c
- Don't forget CLIENT_REMEMBER_OPTIONS for compressed slave protocol
- Removed not used stage variables
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a309fc5cdc5..d8ec946ad16 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -6063,7 +6063,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi, #endif ulong client_flag= CLIENT_REMEMBER_OPTIONS; if (opt_slave_compressed_protocol) - client_flag=CLIENT_COMPRESS; /* We will use compression */ + client_flag|= CLIENT_COMPRESS; /* We will use compression */ mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout); mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (char *) &slave_net_timeout); |