diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
| commit | 050048462c8209a5e5d75587147d343f683cc7df (patch) | |
| tree | e59402376e17ec2bcafbd8ff085307b066cdf7c4 /sql/log.h | |
| parent | 47c1ce35e2ce9b9e756be17ab3a1ce309eea12c8 (diff) | |
| parent | 435866976746d342847ad2a7a13be77cd77c556b (diff) | |
| download | mariadb-git-050048462c8209a5e5d75587147d343f683cc7df.tar.gz | |
Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)
Manual merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log.h b/sql/log.h index 6f86d6ca5f8..1fc13afe7d1 100644 --- a/sql/log.h +++ b/sql/log.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -353,8 +353,8 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG int new_file_impl(bool need_lock); public: - MYSQL_LOG::generate_name; - MYSQL_LOG::is_open; + using MYSQL_LOG::generate_name; + using MYSQL_LOG::is_open; /* This is relay log */ bool is_relay_log; |