diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/examples/Makefile.am | 5 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 2712e0dff48..5b0a86e679c 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -14,13 +14,14 @@ link_sources: DEFS = -DEMBEDDED_LIBRARY INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \ - -I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes) + -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ + $(openssl_includes) LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) mysqltest_LINK = $(CXXLINK) - mysqltest_SOURCES = mysqltest.c +mysqltest_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \ my_readline.h sql_string.h completion_hash.h diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 85e4ccd48bf..15f07667625 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -591,7 +591,7 @@ err: C_MODE_END -bool Protocol::send_fields(List<Item> *list, int flags) +bool Protocol::send_fields(List<Item> *list, uint flags) { List_iterator_fast<Item> it(*list); Item *item; diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 3b9c2bab448..a2c4be1a078 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -145,7 +145,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION || (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION && - host && strcmp(host,LOCAL_HOST))) + host && *host && strcmp(host,LOCAL_HOST))) DBUG_RETURN(cli_mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket, client_flag)); |