Changeset: 01475b9c4360 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=01475b9c4360
Added Files:
common/utils/mprompt.h
common/utils/prompt.c
Removed Files:
clients/mapiclient/mprompt.h
clients/mapiclient/prompt.c
Modified Files:
clients/mapiclient/Makefile.ag
clients/python2/monetdb/mapi.py
clients/python3/monetdb/mapi.py
common/utils/Makefile.ag
sql/test/BugTracker-2013/Tests/All
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (142 lines):
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -9,21 +9,23 @@ INCLUDES = ../mapilib ../../common/optio
lib_mcutil = {
NOINST
- SOURCES = dump.c prompt.c dotmonetdb.c eventparser.c eventparser.h
+ SOURCES = dump.c dotmonetdb.c dotmonetdb.h eventparser.c eventparser.h
}
bin_mclient = {
SOURCES = mclient.c ReadlineTools.c ReadlineTools.h
LIBS = libmcutil ../mapilib/libmapi \
../../common/stream/libstream \
+ ../../common/utils/libmutils \
$(READLINE_LIBS) \
$(curl_LIBS) $(LTLIBICONV) $(PTHREAD_LIBS) $(MATH_LIBS)
$(SOCKET_LIBS)
}
bin_msqldump = {
- SOURCES = msqldump.c
+ SOURCES = msqldump.c msqldump.h
LIBS = libmcutil ../mapilib/libmapi \
../../common/stream/libstream \
+ ../../common/utils/libmutils \
$(curl_LIBS)
}
@@ -31,6 +33,7 @@ bin_stethoscope = {
SOURCES = stethoscope.c
LIBS = libmcutil ../mapilib/libmapi \
../../common/stream/libstream \
+ ../../common/utils/libmutils \
$(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
}
@@ -38,6 +41,7 @@ bin_tachograph = {
SOURCES = tachograph.c
LIBS = libmcutil ../mapilib/libmapi \
../../common/stream/libstream \
+ ../../common/utils/libmutils \
$(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
}
@@ -45,6 +49,7 @@ bin_tomograph = {
SOURCES = tomograph.c
LIBS = libmcutil ../mapilib/libmapi \
../../common/stream/libstream \
+ ../../common/utils/libmutils \
$(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
}
@@ -59,6 +64,6 @@ bin_tomograph = {
man_MANS = mclient.1 msqldump.1
-EXTRA_DIST = msqldump.h mprompt.h dotmonetdb.h $(man_MANS)
+EXTRA_DIST = $(man_MANS)
EXTRA_DIST_DIR = Tests
diff --git a/clients/python2/monetdb/mapi.py b/clients/python2/monetdb/mapi.py
--- a/clients/python2/monetdb/mapi.py
+++ b/clients/python2/monetdb/mapi.py
@@ -73,7 +73,7 @@ class Connection(object):
hostname = None
if not unix_socket and os.path.exists("/tmp/.s.monetdb.%i" % port):
unix_socket = "/tmp/.s.monetdb.%i" % port
- elif not hostname:
+ elif not unix_socket and not hostname:
hostname = 'localhost'
self.hostname = hostname
diff --git a/clients/python3/monetdb/mapi.py b/clients/python3/monetdb/mapi.py
--- a/clients/python3/monetdb/mapi.py
+++ b/clients/python3/monetdb/mapi.py
@@ -74,7 +74,7 @@ class Connection(object):
hostname = None
if not unix_socket and os.path.exists("/tmp/.s.monetdb.%i" % port):
unix_socket = "/tmp/.s.monetdb.%i" % port
- elif not hostname:
+ elif not unix_socket and not hostname:
hostname = 'localhost'
self.hostname = hostname
diff --git a/common/utils/Makefile.ag b/common/utils/Makefile.ag
--- a/common/utils/Makefile.ag
+++ b/common/utils/Makefile.ag
@@ -12,7 +12,7 @@ INCLUDES = $(openssl_CFLAGS)
lib_mutils = {
NOINST
- SOURCES = mutils.h mutils.c
+ SOURCES = mutils.h mutils.c prompt.c mprompt.h
}
lib_mcrypt = {
diff --git a/clients/mapiclient/mprompt.h b/common/utils/mprompt.h
rename from clients/mapiclient/mprompt.h
rename to common/utils/mprompt.h
diff --git a/clients/mapiclient/prompt.c b/common/utils/prompt.c
rename from clients/mapiclient/prompt.c
rename to common/utils/prompt.c
--- a/clients/mapiclient/prompt.c
+++ b/common/utils/prompt.c
@@ -7,8 +7,6 @@
*/
#include "monetdb_config.h"
-#include <monet_options.h>
-#include "mapi.h"
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
@@ -39,12 +37,12 @@ prompt_getlogin(void)
* The correct procedure for determining the login name is to call
* cuserid(3C), or to call getlogin() and if it fails to call
* getpwuid(3C). */
- return(cuserid(NULL));
+ return cuserid(NULL);
# else
- return(getlogin());
+ return getlogin();
# endif
#else
- return(defaultlogin);
+ return defaultlogin;
#endif
}
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -5,7 +5,7 @@ HAVE_PHP?php-size-limit-bug
select-around-zero.Bug-3220
segfault_in_aggregation.Bug-3225
subtract-one-year.Bug-3215
-perl-undef-0.Bug-3235
+HAVE_PERL?perl-undef-0.Bug-3235
crash-from-optimizer.Bug-3241
select-view-view.Bug-3245
stddev-group.Bug-3257
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
