Changeset: 088eeeaf7ca6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=088eeeaf7ca6
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
libversions
sql/ChangeLog-Archive
sql/ChangeLog.Feb2013
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (91 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -520,3 +520,6 @@ fc0c9b319d2275215c283a7ece1d389e55b43217
0ee398b5025f7bc3c0320d70eb5c0a3707b69c67 mutation_root
7daa66a6db1c0404dbf7ed935437b59b7bf54d4b Feb2013_5
df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+cb55e859a50e0d06a50cc9e4f6e377ddea7cc3aa Feb2013_7
+df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+e0139450d66e4fc02c7f5d1d9e6f92fc22d862df Feb2013_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -722,6 +722,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Apr 26 2013 Sjoerd Mullender <[email protected]> - 11.15.7-20130426
+- Rebuilt.
+
+* Sat Apr 13 2013 Niels Nes <[email protected]> - 11.15.7-20130426
+- sql: Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
* Fri Apr 12 2013 Sjoerd Mullender <[email protected]> - 11.15.5-20130412
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.15.7-20130426) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Fri, 26 Apr 2013 13:09:55 +0200
+
+monetdb (11.15.7-20130426) unstable; urgency=low
+
+ * sql: Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
+ -- Niels Nes <[email protected]> Sat, 13 Apr 2013 13:09:54 +0200
+
monetdb (11.15.5-20130412) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=9:2:0
+GDK_VERSION=9:3:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=6:5:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=14:2:0
+MONETDB5_VERSION=14:3:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=4:5:1
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Sat Apr 13 2013 Niels Nes <[email protected]> - 11.15.7-20130426
+- Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
* Wed Nov 21 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212
- Fixed crash when performing an INSERT on a table with string-like column
defaulting to NULL and omitting that column from VALUES, bug #3168
diff --git a/sql/ChangeLog.Feb2013 b/sql/ChangeLog.Feb2013
--- a/sql/ChangeLog.Feb2013
+++ b/sql/ChangeLog.Feb2013
@@ -1,7 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Sat Apr 13 2013 Niels Nes <[email protected]>
-- Added TEMPORARY to the non-reserved keywords, ie no need for double
- quotes when used as identifier.
-
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
