diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-19 22:25:44 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-19 22:25:44 +0200 |
| commit | 161942e3cefd8923633e0a7b3b7a9860a95f6fbc (patch) | |
| tree | abbee7d78d1399086c301a5bd02f3ba4a9e1ea38 /libmysqld | |
| parent | d7bedeb998c911c921d7b67dc07049955481d9b7 (diff) | |
| parent | 7517a59a6dac4580b1f7b5cf87abf6d75b096bbc (diff) | |
| download | mariadb-git-161942e3cefd8923633e0a7b3b7a9860a95f6fbc.tar.gz | |
Merge with 4.0.12
Docs/internals.texi:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_vio.c:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/key.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
strings/strto.c:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 4 | ||||
| -rw-r--r-- | libmysqld/lib_vio.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index daf65cb2f80..b36f8d92490 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -32,14 +32,14 @@ noinst_LIBRARIES = libmysqld_int.a pkglib_LIBRARIES = libmysqld.a SUBDIRS = . examples libmysqld_sources= libmysqld.c lib_sql.cc -libmysqlsources = errmsg.c get_password.c password.c +libmysqlsources = errmsg.c get_password.c noinst_HEADERS = embedded_priv.h sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ ha_innodb.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \ ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \ - hostname.cc init.cc \ + hostname.cc init.cc password.c \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ item_uniq.cc item_subselect.cc item_row.cc\ diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c index 3f89c544ce9..14c1366e5f9 100644 --- a/libmysqld/lib_vio.c +++ b/libmysqld/lib_vio.c @@ -33,7 +33,6 @@ #include <violite.h> #include <my_net.h> #include <m_string.h> -#include <dbug.h> #include <assert.h> #ifndef __WIN__ |