Commit 3f28181b authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 16f11f94 49dd5909

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
monty@tramp.mysql.fi

monty@donna.mysql.com

sasha@mysql.sashanet.com

sql/log.cc

+19 −0
Original line number Diff line number Diff line
@@ -476,6 +476,25 @@ void MYSQL_LOG::write(Query_log_event* event_info) 
	}

      }



      if(thd->convert_set)

	{

	  char buf[1024] = "SET CHARACTER SET ";

	  char* p = strend(buf);

	  p = strmov(p, thd->convert_set->name);

	  int save_query_length = thd->query_length;

	  // just in case somebody wants it later

	  thd->query_length = (uint)(p - buf);

	  Query_log_event e(thd, buf);

	  if(e.write(file))

	    {

	      sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);

	      goto err;

	    }



	  thd->query_length = save_query_length; // clean up

	  

	}

	  

      if (event_info->write(file))

      {

	sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);