diff options
| author | unknown <tim@white.box> | 2001-08-21 19:04:31 -0400 |
|---|---|---|
| committer | unknown <tim@white.box> | 2001-08-21 19:04:31 -0400 |
| commit | 003d978acd505b3db36418f326782dc4ac55b9a7 (patch) | |
| tree | ca5489dfe0fe3741cd56b3cf37c518d108839342 /sql/mini_client.cc | |
| parent | e3a9e7e40e63e8bed554cfbceacf29490df1a14a (diff) | |
| download | mariadb-git-003d978acd505b3db36418f326782dc4ac55b9a7.tar.gz | |
Fix some libmysqld problems.
BitKeeper/etc/ignore:
Added libmysqld/ha_innobase.cc to the ignore list
libmysqld/Makefile.am:
Add ha_innobase.cc to libmysqld.
libmysqld/lib_sql.cc:
Hack to get shutdown working properly in libmysqld. Probably
this is not quite correct.
sql/mini_client.cc:
Remove name collision in embedded libmysqld.
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 261b1d03f78..d52dc40f6a8 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -40,6 +40,11 @@ #include "mysqld_error.h" #include "errmsg.h" +#ifdef EMBEDDED_LIBRARY +#define net_read_timeout net_read_timeout1 +#define net_write_timeout net_write_timeout1 +#endif + extern ulong net_read_timeout; extern "C" { // Because of SCO 3.2V4.2 |