Changeset: c93598caddba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c93598caddba
Modified Files:
monetdb5/mal/mal_import.c
monetdb5/mal/mal_session.c
sql/backends/monet5/sql_scenario.c
Branch: Feb2013
Log Message:
Some English; some layout.
diffs (52 lines):
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -105,9 +105,9 @@ malLoadScript(Client c, str name, bstrea
/*
* Beware that we have to isolate the execution of the source file
- * in its own environment. E.g. we have to removed the execution
+ * in its own environment. E.g. we have to remove the execution
* state until we are finished.
- * The script being read my contain errors, such as non-balanced
+ * The script being read may contain errors, such as non-balanced
* brackets as indicated by blkmode.
* It should be reset before continuing.
*/
@@ -158,10 +158,11 @@ malLoadScript(Client c, str name, bstrea
c->mode = oldmode; \
c->blkmode = oldblkmode; \
c->srcFile = oldsrcFile;
+
/*
* The include operation parses the file indentified and
* leaves the MAL code behind in the 'main' function.
-*/
+ */
str
malInclude(Client c, str name, int listing)
{
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -34,7 +34,7 @@
* The MonetDB server uses a startup script to boot the system.
* This script is an ordinary MAL program, but will mostly
* consist of include statements to load modules of general interest.
- * The startup script is ran as user Admin.
+ * The startup script is run as user Admin.
*/
int
malBootstrap(void)
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1093,7 +1093,7 @@ SQLstatementIntern(Client c, str *expr,
goto endofcompile;
}
#ifdef _SQL_COMPILE
- mnstr_printf(c->fdout, "#parse/execute result %d\n", err);
+ mnstr_printf(c->fdout, "#parse/execute result %d\n", err);
#endif
assert(c->glb == 0 || c->glb == oldglb); /* detect leak */
c->glb = oldglb;
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
