diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-16 17:53:22 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-16 17:53:22 -0700 |
| commit | 3dc874a7c09932191a8105fc922ea45fde751a67 (patch) | |
| tree | e5a75ad817a81098302cd4e933badfabe9e6ccae /sql/log.cc | |
| parent | 07b4739b7cfdf86e1e0a384761617c300dc4042b (diff) | |
| parent | 6e8c7df035f12f12f276837838dfbff25d4bb2a6 (diff) | |
| download | mariadb-git-3dc874a7c09932191a8105fc922ea45fde751a67.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
Auto converge
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index d5b2b16b368..4f25d758f19 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -276,7 +276,7 @@ int MYSQL_LOG::find_first_log(LOG_INFO* linfo, const char* log_name) // if the log entry matches, empty string matching anything if (!log_name_len || - (log_name_len == length+1 && fname[log_name_len] == '\n' && + (log_name_len == length-1 && fname[log_name_len] == '\n' && !memcmp(fname, log_name, log_name_len))) { fname[length-1]=0; // remove last \n |