MonetDB: default - Merge with Dec2011 branch.

[Sjoerd Mullender]

Changeset: 490be515b130 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=490be515b130
Modified Files:
        
Branch: default
Log Message:

Merge with Dec2011 branch.


diffs (44 lines):

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
@@ -367,7 +367,7 @@ handle_error(mvc *m, stream *out, int ps
 }
 
 static str
-sql_update_dec2010( Client c, mvc *m )
+sql_update_dec2011( Client c, mvc *m )
 {
        node *nsch, *ntab, *ncol;
        sql_trans *tr;
@@ -403,8 +403,8 @@ sql_update_dec2010( Client c, mvc *m )
        }
        if (bufsize < pos + 256) 
                buf = GDKrealloc(buf, bufsize += 1024);
-       pos += snprintf(buf+pos, bufsize-pos, "create filter function 
\"like\"(val string, pat string, esc string) external name 
pcre.like_filter;\n");
-       pos += snprintf(buf+pos, bufsize-pos, "create filter function 
\"ilike\"(val string, pat string, esc string) external name 
pcre.ilike_filter;\n");
+       pos += snprintf(buf+pos, bufsize-pos, "create filter function 
sys.\"like\"(val string, pat string, esc string) external name 
pcre.like_filter;\n");
+       pos += snprintf(buf+pos, bufsize-pos, "create filter function 
sys.\"ilike\"(val string, pat string, esc string) external name 
pcre.ilike_filter;\n");
        printf("%s\n", buf);
        if ((err = SQLstatementIntern(c, &buf, "update", 1, 0)) != MAL_SUCCEED) 
{
                GDKfree(buf);
@@ -531,7 +531,7 @@ SQLinitClient(Client c)
                sql_find_subtype(&clob, "clob", 0, 0);
                if (!sql_bind_func3(m->sa, mvc_bind_schema(m,"sys"), "like", 
&clob, &clob, &clob, F_FILT )) {
                        char *err;
-                       if ((err = sql_update_dec2010(c, m)) != NULL)
+                       if ((err = sql_update_dec2011(c, m)) != NULL)
                                fprintf(stderr, "!%s\n", err);
                }
        }
diff --git a/sql/test/leaks/Tests/check0.stable.out 
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -84,7 +84,7 @@ Ready.
 % L3,  L4 # name
 % char,        wrd # type
 % 10,  2 # length
-[ "persistent",        24      ]
+[ "persistent",        25      ]
 
 # 22:02:15 >  
 # 22:02:15 >  Done.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list