diff options
| author | unknown <sergefp@mysql.com> | 2004-12-14 03:37:20 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-12-14 03:37:20 +0300 |
| commit | e19a3042efa64cc0ca5142ceeacd40729740eb39 (patch) | |
| tree | 572218740a9d5a6e3c42a3b563ddb70df9679fa3 /sql | |
| parent | 8322eb0aaaf410819da5eaa95ecd5e3b6ce3c2b0 (diff) | |
| parent | 8bfe7550073970596cd27ffd8aff55d6af1bf544 (diff) | |
| download | mariadb-git-e19a3042efa64cc0ca5142ceeacd40729740eb39.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 7 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 7a4d14d101a..087e58a7bad 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1416,7 +1416,9 @@ Load_log_event::Load_log_event(THD *thd_arg, sql_exchange *ex, List<Item> &fields_arg, enum enum_duplicates handle_dup, bool using_trans) - :Log_event(thd_arg, 0, using_trans), thread_id(thd_arg->thread_id), + :Log_event(thd_arg, !thd_arg->tmp_table_used ? + 0 : LOG_EVENT_THREAD_SPECIFIC_F, using_trans), + thread_id(thd_arg->thread_id), slave_proxy_id(thd_arg->variables.pseudo_thread_id), num_fields(0),fields(0), field_lens(0),field_block_len(0), @@ -1606,6 +1608,9 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db, commented ? "# " : "", db); + if (flags & LOG_EVENT_THREAD_SPECIFIC_F) + fprintf(file,"%sSET @@session.pseudo_thread_id=%lu;\n", + commented ? "# " : "", (ulong)thread_id); fprintf(file, "%sLOAD DATA ", commented ? "# " : ""); if (check_fname_outside_temp_buf()) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9343c79c9f0..e39c902444e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4757,7 +4757,8 @@ replicating a LOAD DATA INFILE command.", (gptr*) &delayed_queue_size, (gptr*) &delayed_queue_size, 0, GET_ULONG, REQUIRED_ARG, DELAYED_QUEUE_SIZE, 1, ~0L, 0, 1, 0}, {"expire_logs_days", OPT_EXPIRE_LOGS_DAYS, - "Binary logs will be rotated after expire-log-days days ", + "If non-zero, binary logs will be purged after expire_logs_days " + "days; possible purges happen at startup and at binary log rotation.", (gptr*) &expire_logs_days, (gptr*) &expire_logs_days, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 99, 0, 1, 0}, |