Changeset: 7b8939176efc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7b8939176efc
Modified Files:
sql/ChangeLog.Jun2023
Branch: txtsim-imp
Log Message:
Merge with Jun2023.
diffs (123 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -306,11 +306,6 @@ SQLhelp sqlhelp1[] = {
"DEALLOCATE [ PREPARE ] { intnr | ** | ALL }",
NULL,
NULL},
- {"DEBUG",
- "Debug a SQL statement using MAL debugger",
- "DEBUG statement",
- NULL,
- "See also
https://www.monetdb.org/documentation/admin-guide/debugging-features/debug-sql-stmt/"},
{"DECLARE",
"Define a local variable",
"DECLARE ident_list data_type",
diff --git a/monetdb5/ChangeLog.Jun2023 b/monetdb5/ChangeLog.Jun2023
--- a/monetdb5/ChangeLog.Jun2023
+++ b/monetdb5/ChangeLog.Jun2023
@@ -1,3 +1,6 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed Mar 1 2023 Niels Nes <[email protected]>
+- The MAL debugger code has been removed.
+
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -127,12 +127,6 @@ typedef struct CLIENT {
* executed. Nesting is indicated using a '+' before the prompt.
*/
int blkmode; /* control block parsing */
- /*
- * The MAL debugger uses the client record to keep track of any
- * pervasive debugger command. For detailed information on the
- * debugger features.
- */
- int debug;
enum clientmode mode; /* FREECLIENT..BLOCKED */
/*
* Client records are organized into a two-level dependency tree,
diff --git a/monetdb5/mal/mal_embedded.c b/monetdb5/mal/mal_embedded.c
--- a/monetdb5/mal/mal_embedded.c
+++ b/monetdb5/mal/mal_embedded.c
@@ -88,7 +88,7 @@ malEmbeddedBoot(int workerlimit, int mem
}
if (!MCinit())
- throw(MAL, "malEmbeddedBoot", "MAL debugger failed to start");
+ throw(MAL, "malEmbeddedBoot", "Failed to initialize clients
structure");
// monet_memory = MT_npages() * MT_pagesize();
initNamespace();
initHeartbeat();
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -135,11 +135,6 @@ CLTInfo(Client cntxt, MalBlkPtr mb, MalS
BUNappend(bn, buf, false) != GDK_SUCCEED)
goto bailout;
- (void) snprintf(buf, sizeof(buf), "%d", cntxt->debug);
- if (BUNappend(b, "debug", false) != GDK_SUCCEED ||
- BUNappend(bn, buf, false) != GDK_SUCCEED)
- goto bailout;
-
CLTtimeConvert(cntxt->login, buf);
if (BUNappend(b, "login", false) != GDK_SUCCEED ||
BUNappend(bn, buf, false) != GDK_SUCCEED)
diff --git a/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023
--- a/sql/ChangeLog.Jun2023
+++ b/sql/ChangeLog.Jun2023
@@ -20,16 +20,19 @@
- Queries stopped with the stop procedure are now marked as 'aborted'
'finished'.
+* Wed Mar 1 2023 Niels Nes <[email protected]>
+- The DEBUG statement has been removed.
+
* Wed Feb 15 2023 Lucas Pereira <[email protected]>
- SQL function sys.queue() overloaded with sys.queue(username string),
SYSADMIN only, allowing to filter the global queue by username or
- use 'ALL' to retrive the global queue. Calling the function without
- arguments returns the current user queue.
+ use 'ALL' to retrieve the global queue. Calling the function without
+ arguments returns the queue for the current user.
- SQL procedures sys.pause(tag bigint), sys.resume(tag bigint),
sys.stop(tag bigint) overloaded with sys.pause(tag bigint, username string),
sys.resume(tag bigint, username string) and sys.stop(tag bigint, username
string), SYSADMIN only, allowing to pause, resume and stop query
- executions by TAG,USERNAME. The call without arguments is a public
+ executions by TAG, USERNAME. The call without arguments is a public
procedure giving access to users to pause, resume and stop their
own query executions.
@@ -56,10 +59,10 @@
- When loading data using COPY BINARY INTO, string used to have their line
endings converted from CR LF to LF. Do not do this, it is the responsibility
of the client.
-- Implement dumping binary data using COPY SELECT ... INTO BINARY <file>.
+- Implemented dumping binary data using COPY SELECT ... INTO BINARY <file(s)>.
* Thu Aug 25 2022 Sjoerd Mullender <[email protected]>
-- Removed code for Workload Capture and Replace. The code was
- experimental, and it didn't work out. A different approach will
- be taken.
+- Removed code for Workload Capture and Replace, including system schemas
+ "wlc" and "wlr" and the objects in those schemas. The code was
+ experimental, and it didn't work out. A different approach will be taken.
diff --git a/sql/test/bincopy/Tests/All b/sql/test/bincopy/Tests/All
--- a/sql/test/bincopy/Tests/All
+++ b/sql/test/bincopy/Tests/All
@@ -55,8 +55,8 @@ bincopy_blobs_on_client
bincopy_blobs_on_server
bincopy_default_values
-bincopy_decimal_range
-bincopy_string_width
bincopycollist-prepare
bincopycollist
+bincopy_decimal_range
+bincopy_string_width
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
