Commit ae462972 authored by unknown's avatar unknown
Browse files

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
parents c9f0aaa6 f83514a0

sql/log_event.cc

+6 −1
Original line number Diff line number Diff line
@@ -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())