Commit d84b42b6 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/home/mysql_src/mysql-4.0


sql/log.cc:
  Auto merged
parents a90c14b6 4014c093

sql/log.cc

+17 −5
Original line number Diff line number Diff line
@@ -1212,13 +1212,25 @@ bool MYSQL_LOG::write(Log_event* event_info) 


    /* Write log events to reset the 'run environment' of the SQL command */



    if (thd && thd->options & OPTION_NO_FOREIGN_KEY_CHECKS)

    if (thd)

    {

      if (thd->options & OPTION_NO_FOREIGN_KEY_CHECKS)

      {

        Query_log_event e(thd, "SET FOREIGN_KEY_CHECKS=1", 24, 0);

        e.set_log_pos(this);

        if (e.write(file))

          goto err;

      }

#if MYSQL_VERSION_ID < 40100      

      if (thd->variables.convert_set)

      {

	Query_log_event e(thd, "SET CHARACTER SET DEFAULT", 25, 0);

	e.set_log_pos(this);

	if (e.write(file))

	  goto err;

      }

#endif

    }



    /*

      Tell for transactional table handlers up to which position in the

sql/log_event.cc

+0 −2
Original line number Diff line number Diff line
@@ -1932,8 +1932,6 @@ Default database: '%s'. Query: '%s'", 
  thd->query= 0;			// just to be sure

  thd->query_length= 0;

  VOID(pthread_mutex_unlock(&LOCK_thread_count));

  // assume no convert for next query unless set explictly

  thd->variables.convert_set = 0;

  close_thread_tables(thd);      

  free_root(&thd->mem_root,MYF(MY_KEEP_PREALLOC));

  return (thd->query_error ? thd->query_error : Log_event::exec_event(rli));