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

into genie.(none):/home/hf/work/04

Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0
into genie.(none):/home/hf/work/04
893cc550 · hf@genie.(none) · 1f10e446 · 8744bd00 · 893cc550 · 893cc550
Commit 893cc550 authored Oct 21, 2002 by hf@genie.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

libmysqld/lib_sql.cc libmysqld/lib_sql.cc +1 -0

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -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

--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -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);