Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26190
Modified Files:
sql_statement.mx sql_updates.mx
Log Message:
If we are using lng, we should use l_val...
We should also make sure all the functions which use these variables are also
using the right types...
U sql_statement.mx
Index: sql_statement.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_statement.mx,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- sql_statement.mx 7 Sep 2008 14:28:00 -0000 1.170
+++ sql_statement.mx 16 Sep 2008 17:03:41 -0000 1.171
@@ -222,7 +222,7 @@
extern stmt *stmt_append(stmt *c, stmt *values);
extern stmt *stmt_table_clear(sql_table *t);
-extern stmt *stmt_import(stmt *t, char *sep, char *rsep, char *ssep, char
*null_string, stmt *file, int nr, int offset);
+extern stmt *stmt_import(stmt *t, char *sep, char *rsep, char *ssep, char
*null_string, stmt *file, lng nr, lng offset);
extern stmt *stmt_export(stmt *t, char *sep, char *rsep, char *ssep, char
*null_string, stmt *file);
extern stmt *stmt_temp(sql_subtype *t);
extern stmt *stmt_atom(atom *op1);
@@ -1873,10 +1873,10 @@
}
stmt *
-stmt_import(stmt *t, char *sep, char *rsep, char *ssep, char *null_string,
stmt *file, int nr, int offset)
+stmt_import(stmt *t, char *sep, char *rsep, char *ssep, char *null_string,
stmt *file, lng nr, lng offset)
{
stmt *s = stmt_create(st_import);
- int *l;
+ lng *l;
s->op1.stval = t;
s->op2.lval = list_create((fdestroy)& GDKfree);
@@ -1884,9 +1884,9 @@
list_append(s->op2.lval, rsep);
list_append(s->op2.lval, ssep);
list_append(s->op2.lval, null_string);
- l = NEW(int); *l = nr;
+ l = NEW(lng); *l = nr;
list_append(s->op2.lval, l);
- l = NEW(int); *l = offset;
+ l = NEW(lng); *l = offset;
list_append(s->op2.lval, l);
s->op4.stval = file;
return s;
U sql_updates.mx
Index: sql_updates.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_updates.mx,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- sql_updates.mx 16 Sep 2008 14:55:42 -0000 1.146
+++ sql_updates.mx 16 Sep 2008 17:03:42 -0000 1.147
@@ -1378,7 +1378,7 @@
}
static stmt *
-sql_import(mvc *sql, sql_table *t, char *tsep, char *rsep, char *ssep, char
*ns, char *filename, int nr, int offset)
+sql_import(mvc *sql, sql_table *t, char *tsep, char *rsep, char *ssep, char
*ns, char *filename, lng nr, lng offset)
{
stmt *rs = NULL;
stmt *fname = (filename) ? stmt_atom_string(_strdup(filename)) : NULL;
@@ -1411,8 +1411,8 @@
char *ssep = (seps->h->next->next)?seps->h->next->next->data.sval:"\"";
char *ns = (null_string)?null_string:"null";
list *slist;
- lng nr = (nr_offset)?nr_offset->h->data.i_val:-1;
- lng offset = (nr_offset)?nr_offset->h->next->data.i_val:0;
+ lng nr = (nr_offset)?nr_offset->h->data.l_val:-1;
+ lng offset = (nr_offset)?nr_offset->h->next->data.l_val:0;
assert(!nr_offset || nr_offset->h->type == type_lng);
assert(!nr_offset || nr_offset->h->next->type == type_lng);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
