Changeset: be7e95175c54 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be7e95175c54
Modified Files:
monetdb5/mal/mal_properties.c
sql/rel.txt
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/sql_mvc.c
sql/storage/bat/bat_storage.c
sql/storage/restrict/restrict_storage.c
Branch: Oct2012
Log Message:
Merge with Jul2012 branch.
diffs (105 lines):
diff --git a/monetdb5/mal/mal_properties.c b/monetdb5/mal/mal_properties.c
--- a/monetdb5/mal/mal_properties.c
+++ b/monetdb5/mal/mal_properties.c
@@ -303,7 +303,7 @@ PropertyIndex(str name)
return i;
}
MT_lock_set(&mal_contextLock, "propertyIndex");
- /* small change its allready added */
+ /* small change its already added */
for (i=0; i<nr_properties; i++) {
if (strcmp(properties[i], name) == 0) {
MT_lock_unset(&mal_contextLock, "propertyIndex");
diff --git a/sql/rel.txt b/sql/rel.txt
--- a/sql/rel.txt
+++ b/sql/rel.txt
@@ -72,7 +72,7 @@ INSERT|DELETE|UPDATE (card MULTI)
For update the ->r projection joins in current
values for 'none' updated columns.
- -> flag (if set don't insert (is done allready))
+ -> flag (if set don't insert (is done already))
only (UPDATE)
-> exps
Named columns to update
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1324,7 +1324,7 @@ exps_can_push_func(list *exps, sql_rel *
* sometimes share (correct or not) expressions on a shared referenced table).
*
* not renaming gives problems with overloaded names (ie on the lower level
an expression
- * with the given name could allready exist
+ * with the given name could already exist
*
* 2
* creating projections for subqueries are empty, for now we just don't
rewrite these.
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -133,7 +133,7 @@ rel_psm_declare(mvc *sql, dnode *n)
/* check if we overwrite a scope local variable declare
x; declare x; */
if (frame_find_var(sql, name)) {
return sql_error(sql, 01,
- "Variable '%s' allready declared",
name);
+ "Variable '%s' already declared", name);
}
/* variables are put on stack,
* TODO make sure on plan/explain etc they only
@@ -160,7 +160,7 @@ rel_psm_declare_table(mvc *sql, dnode *n
if (sname) /* not allowed here */
return sql_error(sql, 02, "DECLARE TABLE: qualified name not
allowed");
if (frame_find_var(sql, name))
- return sql_error(sql, 01, "Variable '%s' allready declared",
name);
+ return sql_error(sql, 01, "Variable '%s' already declared",
name);
assert(n->next->next->next->type == type_int);
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1230,7 +1230,7 @@ rel_with_query(mvc *sql, symbol *q )
sql_rel *nrel;
if (frame_find_var(sql, name)) {
- return sql_error(sql, 01, "Variable '%s' allready
declared", name);
+ return sql_error(sql, 01, "Variable '%s' already
declared", name);
}
nrel = rel_semantic(sql, sym);
if (!nrel) {
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -228,7 +228,7 @@ mvc_commit(mvc *m, int chain, char *name
m->session->tr = sql_trans_create(m->session->stk, tr, name);
store_unlock();
m->type = Q_TRANS;
- if (m->qc) /* clean query cache, protect against concurrent
access on the hash tables (when functions allready exists, concurrent mal will
+ if (m->qc) /* clean query cache, protect against concurrent
access on the hash tables (when functions already exists, concurrent mal will
build up the hash (not copyied in the trans dup)) */
qc_clean(m->qc);
m->session->schema = find_sql_schema(m->session->tr,
m->session->schema_name);
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1246,7 +1246,7 @@ gtr_minmax_col( sql_trans *tr, sql_colum
if (store_nr_active > 0)
return LOG_ERR;
- /* allready set */
+ /* already set */
if (!cbat || c->type.type->localtype >= TYPE_str || c->t->system)
return ok;
diff --git a/sql/storage/restrict/restrict_storage.c
b/sql/storage/restrict/restrict_storage.c
--- a/sql/storage/restrict/restrict_storage.c
+++ b/sql/storage/restrict/restrict_storage.c
@@ -95,7 +95,7 @@ update_bat( sql_bat *bat, BAT *upd, int
u = bat_new(TYPE_oid, b->ttype, 1);
bat->ubid = temp_create(u);
}
- r = BATkdiff(old, u); /* don't keep allready updated values */
+ r = BATkdiff(old, u); /* don't keep already updated values */
bat_destroy(old);
BATins(u, r, FALSE);
bat_destroy(u);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
