diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 2cbf960460f..022a589e304 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -56,7 +56,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \ - spatial.cc gstream.cc + spatial.cc gstream.cc sql_help.cc EXTRA_DIST = lib_vio.c diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 2b52b133133..69ff8f535fd 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -11,7 +11,7 @@ DEFS = -DEMBEDDED_LIBRARY INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes) LIBS = @LIBS@ -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @bdb_libs_with_path@ @LIBDL@ $(CXXLDFLAGS) mysqltest_SOURCES = mysqltest.c diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 8b658642c25..114529c44be 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -138,6 +138,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); |