Changeset: 63b2e1115306 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63b2e1115306
Added Files:
sql/Changelog.Feb2013
Modified Files:
clients/php/doc/generate_doc.sh
clients/php/examples/query.php
clients/ruby/lib/MonetDBExceptions.rb
gdk/gdk_bbp.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/last_line_without_newline.SF-922390_s02.sql
sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.3.sql
sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.pl
sql/test/BugTracker-2013/Tests/php-size-limit-bug.php
sql/test/bugs/union_all_where_1=1-bug-sf-936386.sql
sql/test/pg_regress/sql/update.sql
sql/test/ssqq/Tests/All
sql/test/ssqq/Tests/insert_query.sql.src
sql/test/ssqq/Tests/insert_queue.sql.src
sql/test/ssqq/Tests/insert_quser.sql.src
sql/test/ssqq/Tests/ssqq.sql.src
Branch: default
Log Message:
Merged with Feb2013 branch.
diffs (165 lines):
diff --git a/clients/php/doc/generate_doc.sh b/clients/php/doc/generate_doc.sh
--- a/clients/php/doc/generate_doc.sh
+++ b/clients/php/doc/generate_doc.sh
@@ -17,4 +17,4 @@ doc_dir=$current_dir/$2
title="MonetDB5 PHP API"
-phpdoc -ti $title -o "HTML:frames:phpedit" -f $source_code -t $doc_dir
\ No newline at end of file
+phpdoc -ti $title -o "HTML:frames:phpedit" -f $source_code -t $doc_dir
diff --git a/clients/php/examples/query.php b/clients/php/examples/query.php
--- a/clients/php/examples/query.php
+++ b/clients/php/examples/query.php
@@ -33,4 +33,4 @@ if (monetdb_connected($db)) {
monetdb_disconnect($db);
}
-?>
\ No newline at end of file
+?>
diff --git a/clients/ruby/lib/MonetDBExceptions.rb
b/clients/ruby/lib/MonetDBExceptions.rb
--- a/clients/ruby/lib/MonetDBExceptions.rb
+++ b/clients/ruby/lib/MonetDBExceptions.rb
@@ -51,5 +51,5 @@ end
class MonetDBProtocolError < StandardError
def initialize(e)
$stderr.puts e
- end
-end
\ No newline at end of file
+ end
+end
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2167,17 +2167,18 @@ decref(bat i, int logical, int releaseSh
if (lock)
MT_lock_unset(&GDKswapLock(i), "BBPdecref");
- if (swap) {
- int destroy = BBP_lrefs(i) == 0 && (BBP_status(i) & BBPDELETED)
== 0;
-
- if (b && destroy) {
- BBPdestroy(b); /* free memory (if loaded) and delete
from disk (if transient but saved) */
- } else if (b) {
+ if (swap && b != NULL) {
+ if (BBP_lrefs(i) == 0 && (BBP_status(i) & BBPDELETED) == 0) {
+ /* free memory (if loaded) and delete from
+ * disk (if transient but saved) */
+ BBPdestroy(b);
+ } else {
BATDEBUG {
mnstr_printf(GDKstdout, "#BBPdecref unload and
free bat %d\n", i);
}
BBP_unload_inc(i, "BBPdecref");
- if (BBPfree(b, "BBPdecref")) /* free memory of
transient */
+ /* free memory of transient */
+ if (BBPfree(b, "BBPdecref"))
return -1; /* indicate failure */
}
}
diff --git a/sql/Changelog.Feb2013 b/sql/Changelog.Feb2013
new file mode 100644
--- /dev/null
+++ b/sql/Changelog.Feb2013
@@ -0,0 +1,7 @@
+# ChangeLog file for sql
+# This file is updated with Maddlog
+
+* Sat Apr 13 2013 Niels Nes <ni...@cwi.nl>
+- Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/last_line_without_newline.SF-922390_s02.sql
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/last_line_without_newline.SF-922390_s02.sql
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/last_line_without_newline.SF-922390_s02.sql
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/last_line_without_newline.SF-922390_s02.sql
@@ -1,1 +1,1 @@
-select * from tab_0;
\ No newline at end of file
+select * from tab_0;
diff --git a/sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.3.sql
b/sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.3.sql
--- a/sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.3.sql
+++ b/sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.3.sql
@@ -1,1 +1,1 @@
-SELECT sum(float1) AS currencyfloat FROM databasetest;
\ No newline at end of file
+SELECT sum(float1) AS currencyfloat FROM databasetest;
diff --git a/sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.pl
b/sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.pl
--- a/sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.pl
+++ b/sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.pl
@@ -10,4 +10,4 @@ use DBI();
my $dbh =
DBI->connect("dbi:monetdb:database=$ARGV[1];host=localhost;port=$ARGV[0];language=sql",
'monetdb', 'monetdb');
my $sth = $dbh->table_info('', '%', '%');
-my $sth2 = $dbh->table_info('foo', '%', '%');
\ No newline at end of file
+my $sth2 = $dbh->table_info('foo', '%', '%');
diff --git a/sql/test/BugTracker-2013/Tests/php-size-limit-bug.php
b/sql/test/BugTracker-2013/Tests/php-size-limit-bug.php
--- a/sql/test/BugTracker-2013/Tests/php-size-limit-bug.php
+++ b/sql/test/BugTracker-2013/Tests/php-size-limit-bug.php
@@ -14,4 +14,4 @@
while ( $row = monetdb_fetch_assoc($res) ) { print_r($row); }
monetdb_disconnect();
-?>
\ No newline at end of file
+?>
diff --git a/sql/test/bugs/union_all_where_1=1-bug-sf-936386.sql
b/sql/test/bugs/union_all_where_1=1-bug-sf-936386.sql
--- a/sql/test/bugs/union_all_where_1=1-bug-sf-936386.sql
+++ b/sql/test/bugs/union_all_where_1=1-bug-sf-936386.sql
@@ -8,4 +8,4 @@ SELECT * FROM (
SELECT 'a' AS TABLE_CAT
UNION ALL
SELECT 'a' AS TABLE_CAT
-) AS tables WHERE 1=1;
\ No newline at end of file
+) AS tables WHERE 1=1;
diff --git a/sql/test/pg_regress/sql/update.sql
b/sql/test/pg_regress/sql/update.sql
--- a/sql/test/pg_regress/sql/update.sql
+++ b/sql/test/pg_regress/sql/update.sql
@@ -16,4 +16,4 @@ UPDATE update_test SET a = DEFAULT, b =
SELECT * FROM update_test;
-DROP TABLE update_test;
\ No newline at end of file
+DROP TABLE update_test;
diff --git a/sql/test/ssqq/Tests/All b/sql/test/ssqq/Tests/All
--- a/sql/test/ssqq/Tests/All
+++ b/sql/test/ssqq/Tests/All
@@ -1,4 +1,4 @@
ssqq
insert_quser
insert_query
-insert_queue
\ No newline at end of file
+insert_queue
diff --git a/sql/test/ssqq/Tests/insert_query.sql.src
b/sql/test/ssqq/Tests/insert_query.sql.src
--- a/sql/test/ssqq/Tests/insert_query.sql.src
+++ b/sql/test/ssqq/Tests/insert_query.sql.src
@@ -1,1 +1,1 @@
-$RELSRCDIR/../insert_query.sql
\ No newline at end of file
+$RELSRCDIR/../insert_query.sql
diff --git a/sql/test/ssqq/Tests/insert_queue.sql.src
b/sql/test/ssqq/Tests/insert_queue.sql.src
--- a/sql/test/ssqq/Tests/insert_queue.sql.src
+++ b/sql/test/ssqq/Tests/insert_queue.sql.src
@@ -1,1 +1,1 @@
-$RELSRCDIR/../insert_queue.sql
\ No newline at end of file
+$RELSRCDIR/../insert_queue.sql
diff --git a/sql/test/ssqq/Tests/insert_quser.sql.src
b/sql/test/ssqq/Tests/insert_quser.sql.src
--- a/sql/test/ssqq/Tests/insert_quser.sql.src
+++ b/sql/test/ssqq/Tests/insert_quser.sql.src
@@ -1,1 +1,1 @@
-$RELSRCDIR/../insert_quser.sql
\ No newline at end of file
+$RELSRCDIR/../insert_quser.sql
diff --git a/sql/test/ssqq/Tests/ssqq.sql.src b/sql/test/ssqq/Tests/ssqq.sql.src
--- a/sql/test/ssqq/Tests/ssqq.sql.src
+++ b/sql/test/ssqq/Tests/ssqq.sql.src
@@ -1,1 +1,1 @@
-$RELSRCDIR/../ssqq.sql
\ No newline at end of file
+$RELSRCDIR/../ssqq.sql
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
