Changeset: a686165c7116 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a686165c7116
Modified Files:
clients/mapilib/mapi.h
monetdb5/modules/mal/mal_mapi.c
Branch: mapihandshake
Log Message:
Have mserver send :XOPTIONS:
diffs (41 lines):
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -27,6 +27,13 @@ typedef int MapiMsg;
#define MMORE (-3)
#define MSERVER (-4)
+enum mapi_handshake_options_levels {
+ MAPI_HANDSHAKE_AUTOCOMMIT,
+ MAPI_HANDSHAKE_REPLY_SIZE,
+ // this must always be the last one:
+ MAPI_HANDSHAKE_OPTIONS_LEVEL,
+};
+
/*
* The table field information is extracted from the table headers
* obtained from the server. This list may be extended in the future.
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -161,8 +161,8 @@ doChallenge(void *data)
return;
}
- // send the challenge over the block stream
- mnstr_printf(fdout, "%s:mserver:9:%s:%s:%s:",
+ // Send the challenge over the block stream
+ mnstr_printf(fdout, "%s:mserver:9:%s:%s:%s:sql=%d:",
challenge,
mcrypt_getHashAlgorithms(),
#ifdef WORDS_BIGENDIAN
@@ -170,7 +170,8 @@ doChallenge(void *data)
#else
"LIT",
#endif
- MONETDB5_PASSWDHASH
+ MONETDB5_PASSWDHASH,
+ MAPI_HANDSHAKE_OPTIONS_LEVEL
);
mnstr_flush(fdout, MNSTR_FLUSH_DATA);
/* get response */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
