diff options
| author | hf@genie.(none) <> | 2002-10-21 09:57:53 +0500 |
|---|---|---|
| committer | hf@genie.(none) <> | 2002-10-21 09:57:53 +0500 |
| commit | 893cc550e0f54cf7babaa011087e5828b44821b9 (patch) | |
| tree | dd4ac0e5101fcefd169d36291ccf3ac642389897 | |
| parent | 1f10e446778c4f54778da2d850b9cdc34db63d16 (diff) | |
| parent | 8744bd0064bf41f65cb0eba21515336133d366d1 (diff) | |
| download | mariadb-git-893cc550e0f54cf7babaa011087e5828b44821b9.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0
into genie.(none):/home/hf/work/04
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e99ac558737..8c51faa4411 100644 --- 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 diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 1afcc0d3147..f50223c789f 100644 --- 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); |