Commit e236de83 authored by unknown's avatar unknown
Browse files

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
  Auto merged
client/mysqlshow.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
netware/mysql_test_run.c:
  Merged from 4.1.
parents bbaf62b4 928ee5ce

netware/mysql_test_run.c

+4 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ void start_master() 
  add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);

  add_arg(&al, "--language=%s", lang_dir);

  add_arg(&al, "--log-bin-trust-routine-creators");

  add_arg(&al, "--log-slow-queries");

  add_arg(&al, "--log-queries-not-using-indexes");

#ifdef DEBUG	//only for debug builds

  add_arg(&al, "--debug");

#endif
@@ -523,6 +525,8 @@ void start_slave() 
  add_arg(&al, "-O");

  add_arg(&al, "slave_net_timeout=10");

  add_arg(&al, "--log-bin-trust-routine-creators");

  add_arg(&al, "--log-slow-queries");

  add_arg(&al, "--log-queries-not-using-indexes");

#ifdef DEBUG	//only for debug builds

  add_arg(&al, "--debug");

#endif

sql/sql_parse.cc

+3 −0
Original line number Diff line number Diff line
@@ -797,6 +797,9 @@ static int check_connection(THD *thd) 


  DBUG_PRINT("info",

             ("New connection received on %s", vio_description(net->vio)));

#ifdef SIGNAL_WITH_VIO_CLOSE

  thd->set_active_vio(net->vio);

#endif



  if (!thd->main_security_ctx.host)         // If TCP/IP connection

  {