diff options
| author | unknown <guilhem@mysql.com> | 2004-12-03 23:09:18 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-12-03 23:09:18 +0100 |
| commit | ae4629726c7d3d08bc8e324ad7394d7484dc0288 (patch) | |
| tree | 76bd7a2f94290884d49e5f7df93320361787ee81 /sql | |
| parent | c9f0aaa6531ec99df577db978a31d20b5964e950 (diff) | |
| parent | f83514a0077fc63fbc446b2d9df2925652b8ec50 (diff) | |
| download | mariadb-git-ae4629726c7d3d08bc8e324ad7394d7484dc0288.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
sql/log_event.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 7 |
1 files changed, 6 insertions, 1 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()) |