Commit 893cc550 authored by hf@genie.(none)'s avatar hf@genie.(none)
Browse files

Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0 

into genie.(none):/home/hf/work/04
parents 1f10e446 8744bd00

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ heikki@donna.mysql.fi 
heikki@hundin.mysql.fi

heikki@rescue.

heikki@work.mysql.com

hf@genie.(none)

jani@dsl-jkl1657.dial.inet.fi

jani@hynda.(none)

jani@hynda.mysql.fi

libmysqld/lib_sql.cc

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ void start_embedded_conn1(NET * net) 
  thd->command=COM_SLEEP;

  thd->version=refresh_version;

  thd->set_time();

  bzero(thd->scramble, sizeof(thd->scramble));

  init_sql_alloc(&thd->mem_root,8192,8192);



  check_connections1(thd);