Commit e102a51a authored by peter@mysql.com's avatar peter@mysql.com
Browse files

Merge mysql.com:/home/pz/mysql/mysql-4.0-root 

into mysql.com:/home/pz/mysql/mysql-4.0
parents 52dfc315 893cc550

BitKeeper/etc/gone

+1181 −1179

File changed.

Preview size limit exceeded, changes collapsed.

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -12,11 +12,13 @@ arjen@george.bitbike.com 
bar@bar.mysql.r18.ru

bar@bar.udmsearch.izhnet.ru

bell@sanja.is.com.ua

bk@admin.bk

davida@isil.mysql.com

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

BitKeeper/etc/skipkeys

0 → 100644
+7 −0
Original line number Diff line number Diff line 
BK|scripts/safe_mysqld.sh|19700101030959|01930|d0a3cc73fd1b0d8d tim@localhost.polyesthetic.msg|scripts/safe_mysqld.sh|20000802235627|38519

bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe arjen@co3064164-a.bitbike.com|BitKeeper/etc/logging_ok|20011212060636|33009

bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554

bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe sasha@work.mysql.com|BitKeeper/etc/logging_ok|20000802223223|24242

bk@work.mysql.com|BitKeeper/etc/logging_ok|20000731192914|03271|5e19f6258f804ffe tim@localhost.polyesthetic.msg|BitKeeper/etc/logging_ok|20000802235640|27343

bk@work.mysql.com|ChangeSet|20000731191004|44203|eae70093a6122e66+ sasha@work.mysql.com|ChangeSet|20000802223249|54774

bk@work.mysql.com|ChangeSet|20000731191004|44203|eae70093a6122e66+ tim@localhost.polyesthetic.msg|ChangeSet|20000802235645|56533

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);