MonetDB: SciQL-2 - Merge with Feb2013 branch.

[Stefan Manegold]

Changeset: 148747ff86a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=148747ff86a9
Modified Files:
        sql/include/sql_relation.h
        sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
        sql/test/mapi/Tests/php_monetdb.SQL.sh
        sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh
Branch: SciQL-2
Log Message:

Merge with Feb2013 branch.


diffs (36 lines):

diff --git a/sql/include/sql_relation.h b/sql/include/sql_relation.h
--- a/sql/include/sql_relation.h
+++ b/sql/include/sql_relation.h
@@ -128,7 +128,7 @@ typedef struct expression {
 #define DDL_CREATE_ROLE 59
 #define DDL_DROP_ROLE  60
 
-#define MAXOPS 20
+#define MAXOPS 21
 
 typedef enum operator_type {
        op_basetable = 0,
diff --git a/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh 
b/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
--- a/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
+++ b/sql/test/BugTracker-2013/Tests/php-size-limit-bug.SQL.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-Mlog -x "php -n -d include_path=$PHP_INCPATH -f 
$TSTSRCDIR/php-size-limit-bug.php $MAPIPORT $TSTDB"
+Mlog -x "php -d include_path=$PHP_INCPATH -f $TSTSRCDIR/php-size-limit-bug.php 
$MAPIPORT $TSTDB"
diff --git a/sql/test/mapi/Tests/php_monetdb.SQL.sh 
b/sql/test/mapi/Tests/php_monetdb.SQL.sh
--- a/sql/test/mapi/Tests/php_monetdb.SQL.sh
+++ b/sql/test/mapi/Tests/php_monetdb.SQL.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-Mlog -x "php -n -d include_path=$PHP_INCPATH -f 
$TSTSRCBASE/clients/examples/php/sqlsample.php $MAPIPORT $TSTDB"
+Mlog -x "php -d include_path=$PHP_INCPATH -f 
$TSTSRCBASE/clients/examples/php/sqlsample.php $MAPIPORT $TSTDB"
diff --git a/sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh 
b/sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh
--- a/sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh
+++ b/sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-Mlog -x "php -n -d include_path=$PHP_INCPATH -f 
$TSTSRCBASE/clients/examples/php/sqlsample.php $MAPIPORT $TSTDB"
+Mlog -x "php -d include_path=$PHP_INCPATH -f 
$TSTSRCBASE/clients/examples/php/sqlsample.php $MAPIPORT $TSTDB"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list