diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-29 19:00:43 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-29 19:00:43 -0500 |
| commit | ecc2c96c9d9b0fb5d94a1203d3ffa1a2d6c036b7 (patch) | |
| tree | 3798790cf0141d8074a1c935dd9d7a9c644de0e4 /sql/slave.cc | |
| parent | d2c72da610074afe95959094a11f95b29a741f29 (diff) | |
| parent | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (diff) | |
| download | mariadb-git-ecc2c96c9d9b0fb5d94a1203d3ffa1a2d6c036b7.tar.gz | |
Merge of maria/5.5 into maria-5.5-galera.
bzr merge -r tag:mariadb-5.5.35 maria/5.5
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 4664db3ac64..169b3dd92d7 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1673,10 +1673,14 @@ when it try to get the value of TIME_ZONE global variable from master."; if (mysql_errno(mysql) == ER_UNKNOWN_SYSTEM_VARIABLE) { - // this is tolerable as OM -> NS is supported - mi->report(WARNING_LEVEL, mysql_errno(mysql), - "Notifying master by %s failed with " - "error: %s", query, mysql_error(mysql)); + /* Ignore this expected error if not a high error level */ + if (global_system_variables.log_warnings > 1) + { + // this is tolerable as OM -> NS is supported + mi->report(WARNING_LEVEL, mysql_errno(mysql), + "Notifying master by %s failed with " + "error: %s", query, mysql_error(mysql)); + } } else { |