Changeset: 084dad091d4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=084dad091d4a
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (92 lines):
diff -r 5d2c2a67f899 -r 084dad091d4a clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Tue Jul 13 10:26:21 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Tue Jul 13 10:54:12 2010 +0200
@@ -1848,12 +1848,11 @@
if ((hdl = mapi_query(mid,
"SELECT
\"t\".\"name\", \"t\".\"type\", "
"\"s\".\"name\" "
- "FROM
\"sys\".\"tables\" \"t\", "
+ "FROM
\"sys\".\"_tables\" \"t\", "
"\"sys\".\"schemas\" \"s\" "
"WHERE
\"t\".\"schema_id\" = \"s\".\"id\" "
"AND
\"s\".\"name\" = \"current_schema\" "
"AND
\"t\".\"system\" = false "
- "AND
\"t\".\"temporary\" = 0 "
"ORDER BY
\"t\".\"name\"")) != NULL &&
mapi_error(mid) == MOK) {
char *type, *name,
*schema;
diff -r 5d2c2a67f899 -r 084dad091d4a clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 13 10:26:21 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 13 10:54:12 2010 +0200
@@ -1054,6 +1054,7 @@
char *errorstr; /* error from server */
struct MapiColumn *fields;
struct MapiRowBuf cache;
+ int commentonly; /* only comments seen so far */
};
@h
@@ -1663,6 +1664,8 @@
result->cache.tuplecount = 0;
result->cache.line = NULL;
+ result->commentonly = 1;
+
return result;
}
@@ -3850,9 +3853,10 @@
nline++; /* query type */
qt = (int) strtol(nline, &nline, 0);
- if (qt != Q_BLOCK || result == NULL)
+ if (result == NULL || (qt != Q_BLOCK && !result->commentonly))
result = new_result(hdl);
result->querytype = qt;
+ result->commentonly = 0;
nline++; /* skip space */
switch (qt) {
@@ -3908,6 +3912,8 @@
n = slice_row(line, NULL, &anchors, &lens, 10, '#');
+ result->commentonly = 0;
+
tag = etag + 1;
while (*tag && isspace((int) (unsigned char) *tag))
tag++;
diff -r 5d2c2a67f899 -r 084dad091d4a
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Tue Jul 13 10:26:21 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Tue Jul 13 10:54:12 2010 +0200
@@ -25,30 +25,6 @@
# 12:59:51 > mclient -lsql -umonetdb -Pmonetdb --host=rig --port=33577
# 12:59:51 >
-% .t # table_name
-% name # name
-% varchar # type
-% 12 # length
-[ "_columns" ]
-[ "_tables" ]
-[ "args" ]
-[ "auths" ]
-[ "columns" ]
-[ "connections" ]
-[ "db_user_info" ]
-[ "dependencies" ]
-[ "functions" ]
-[ "idxs" ]
-[ "keycolumns" ]
-[ "keys" ]
-[ "privileges" ]
-[ "schemas" ]
-[ "sequences" ]
-[ "tables" ]
-[ "triggers" ]
-[ "types" ]
-[ "user_role" ]
-[ "users" ]
CREATE TABLE "sys"."triggers" (
"id" int,
"name" varchar(1024),
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
