diff options
| author | unknown <guilhem@mysql.com> | 2003-07-12 15:25:08 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-07-12 15:25:08 +0200 |
| commit | 351a03df7a68ed539ac2fe2e4de6c769869c387b (patch) | |
| tree | 6aa6d68153f4ba201f8db8e9f4de9420d207e4ea | |
| parent | 1c5773add420572a012d9f2d8e382dc15e5e1107 (diff) | |
| parent | 543208de96a21a536741281b03b80bc0d6e3f589 (diff) | |
| download | mariadb-git-351a03df7a68ed539ac2fe2e4de6c769869c387b.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
| -rw-r--r-- | sql/log.cc | 9 | ||||
| -rw-r--r-- | sql/mysqld.cc | 11 | ||||
| -rw-r--r-- | sql/sql_class.h | 1 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sql/log.cc b/sql/log.cc index 7b35433b830..912cdf0a1a8 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1089,7 +1089,14 @@ bool MYSQL_LOG::write(Log_event* event_info) #endif if ((thd && !(thd->options & OPTION_BIN_LOG) && (thd->master_access & SUPER_ACL)) || - (local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db))) + (local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db)) + /* + This is the place for future tests like "do the involved tables match + (to be implemented) binlog_[wild_]{do|ignore}_table?" (WL#1049): + we will add a + && ... to the if(). + */ + ) { VOID(pthread_mutex_unlock(&LOCK_log)); DBUG_PRINT("error",("!db_ok")); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c21d71466ba..88ae612950e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1966,14 +1966,9 @@ bool open_log(MYSQL_LOG *log, const char *hostname, if (type == LOG_BIN) { char *p = fn_ext(opt_name); - if (p) - { - uint length=(uint) (p-opt_name); - strmake(tmp,opt_name,min(length,FN_REFLEN)); - opt_name=tmp; - } - if (*fn_ext(opt_name)) - log->set_no_rotate(1); + uint length=(uint) (p-opt_name); + strmake(tmp,opt_name,min(length,FN_REFLEN)); + opt_name=tmp; } return log->open(opt_name, type, 0, index_file_name, (read_append) ? SEQ_READ_APPEND : WRITE_CACHE, diff --git a/sql/sql_class.h b/sql/sql_class.h index cd622520df3..dfdcbcc996c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -175,7 +175,6 @@ public: inline void unlock_index() { pthread_mutex_unlock(&LOCK_index);} inline IO_CACHE *get_index_file() { return &index_file;} inline uint32 get_open_count() { return open_count; } - inline void set_no_rotate(bool no_rotate_arg) {no_rotate= no_rotate_arg;} }; /* character conversion tables */ |