diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-12 04:34:56 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-12 04:34:56 +0200 |
| commit | 28ad76e22c799a933006e8cad31a7389e85106eb (patch) | |
| tree | 3c78736b50f99b9b8ac968afb833752f201a482a /sql/log.cc | |
| parent | 7847639270269bc6aebeed36e68ddfec0cf6c145 (diff) | |
| download | mariadb-git-28ad76e22c799a933006e8cad31a7389e85106eb.tar.gz | |
Fixed delete in tables with hidden primary key
Remove not used BDB logs on shutdown
Don't give warnings for repair on slaves
Fixed transaction log files
Docs/manual.texi:
Updated 'known bugs'
include/my_sys.h:
Added define for checking number of bytes left in the IO_CACHE
mysql-test/mysql-test-run:
Small bug fixes
mysys/mf_iocache2.c:
Use new define
sql/filesort.cc:
Temporary fix for FULLTEXT index
sql/ha_berkeley.cc:
Fix for delete in tables with hidden primary key
Remove not used BDB logs on shutdown
sql/ha_myisam.cc:
Don't give warnings for repair on slaves
sql/hostname.cc:
Portability fix
sql/log.cc:
Fix transaction log files
sql/log_event.h:
portability fix
sql/slave.cc:
Don't give warnings for repair on slaves
sql/sql_class.h:
Cleanup
sql/sql_parse.cc:
Fixed typo
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/log.cc b/sql/log.cc index 49e0faf4a7a..41fb4bfb856 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -76,7 +76,7 @@ static int find_uniq_filename(char *name) MYSQL_LOG::MYSQL_LOG(): last_time(0), query_start(0),index_file(-1), name(0), log_type(LOG_CLOSED),write_error(0), - inited(0), opened(0), no_rotate(0) + inited(0), no_rotate(0) { /* We don't want to intialize LOCK_Log here as the thread system may @@ -616,7 +616,7 @@ bool MYSQL_LOG::write(Query_log_event* event_info) IO_CACHE *file = (event_info->cache_stmt ? &thd->transaction.trans_log : &log_file); if ((!(thd->options & OPTION_BIN_LOG) && - thd->master_access & PROCESS_ACL) || + (thd->master_access & PROCESS_ACL)) || !db_ok(event_info->db, binlog_do_db, binlog_ignore_db)) { VOID(pthread_mutex_unlock(&LOCK_log)); @@ -684,14 +684,14 @@ bool MYSQL_LOG::write(IO_CACHE *cache) if (is_open()) { uint length; - my_off_t start_pos=my_b_tell(&log_file); if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) { sql_print_error(ER(ER_ERROR_ON_WRITE), cache->file_name, errno); goto err; } - while ((length=my_b_fill(cache))) + length=my_b_bytes_in_cache(cache); + do { if (my_b_write(&log_file, cache->rc_pos, length)) { @@ -700,7 +700,7 @@ bool MYSQL_LOG::write(IO_CACHE *cache) goto err; } cache->rc_pos=cache->rc_end; // Mark buffer used up - } + } while ((length=my_b_fill(cache))); if (flush_io_cache(&log_file)) { if (!write_error) |