Merge remote-tracking branch 'origin/master'

# Conflicts:
#	h2/src/docsrc/html/changelog.html

h2/src/docsrc/html/changelog.html

@@ -23,17 +23,24 @@ Change Log
 <ul>
 <li>improve performance of queries that use LIKE 'foo%' - 10x in the case of one of my queries
 </li>
-<li>Issue #229: DATEDIFF does not work for 'WEEK'
+<li>Issue #231: Possible infinite loop when initializing the ObjectDataType class
+    when concurrently writing into MVStore.
 </li>
-<li>Issue #156: Add support for getGeneratedKeys() when executing commands via PreparedStatement#executeBatch
+</ul>
+
+<h2>Version 1.4.191 Beta (2016-01-21)</h2>
+<ul>
+<li>Issue #229: DATEDIFF does not work for 'WEEK'.
+</li>
+<li>Issue #156: Add support for getGeneratedKeys() when executing commands via PreparedStatement#executeBatch.
 </li>
-<li>Issue #195: The new Maven uses a .cmd file instead of a .bat file
+<li>Issue #195: The new Maven uses a .cmd file instead of a .bat file.
 </li>
-<li>Issue #212: EXPLAIN PLAN for UPDATE statement did not display LIMIT expression
+<li>Issue #212: EXPLAIN PLAN for UPDATE statement did not display LIMIT expression.
 </li>
-<li>Support OFFSET without LIMIT in SELECT
+<li>Support OFFSET without LIMIT in SELECT.
 </li>
-<li>Improve error message for METHOD_NOT_FOUND_1/90087
+<li>Improve error message for METHOD_NOT_FOUND_1/90087.
 </li>
 <li>CLOB and BLOB objects of removed rows were sometimes kept in the database file.
 </li>

h2/src/docsrc/textbase/_messages_en.prop

@@ -83,6 +83,7 @@
 90053=Scalar subquery contains more than one row
 90054=Invalid use of aggregate function {0}
 90055=Unsupported cipher {0}
+90056=Function {0}: Invalid date format: {1}
 90057=Constraint {0} not found
 90058=Commit or rollback is not allowed within a trigger
 90059=Ambiguous column name {0}
@@ -113,7 +114,7 @@
 90084=Cannot drop last column {0}
 90085=Index {0} belongs to constraint {1}
 90086=Class {0} not found
-90087=Method {0} with matching arguments not found
+90087=Method {0} not found
 90088=Unknown mode {0}
 90089=Collation cannot be changed because there is a data table: {0}
 90090=Schema {0} cannot be dropped

h2/src/main/org/h2/engine/Constants.java

@@ -16,7 +16,7 @@ public class Constants {
     /**
      * The build date is updated for each public release.
      */
-    public static final String BUILD_DATE = "2015-10-11";
+    public static final String BUILD_DATE = "2016-01-21";
 
     /**
      * The build date of the last stable release.
@@ -26,7 +26,7 @@ public class Constants {
     /**
      * The build id is incremented for each public release.
      */
-    public static final int BUILD_ID = 190;
+    public static final int BUILD_ID = 191;
 
     /**
      * The build id of the last stable release.

h2/src/main/org/h2/mvstore/type/ObjectDataType.java

@@ -332,8 +332,13 @@ public class ObjectDataType implements DataType {
         HashMap<Class<?>, Integer> map = COMMON_CLASSES_MAP;
         if (map.size() == 0) {
             // lazy initialization
-            for (int i = 0, size = COMMON_CLASSES.length; i < size; i++) {
-                COMMON_CLASSES_MAP.put(COMMON_CLASSES[i], i);
+            // synchronized, because the COMMON_CLASSES_MAP is not
+            synchronized (map) {
+                if (map.size() == 0) {
+                    for (int i = 0, size = COMMON_CLASSES.length; i < size; i++) {
+                        map.put(COMMON_CLASSES[i], i);
+                    }
+                }
             }
         }
         return map.get(clazz);

h2/src/main/org/h2/res/_messages_cs.prop

@@ -114,7 +114,7 @@
 90084=Nelze odstranit poslední sloupec {0}
 90085=Index {0} patří k omezení {1}
 90086=Třída {0} nenalezena
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088=Neznámý režim {0}
 90089=Porovnání nemůže být změněno, protože jde o datovou tabulku: {0}
 90090=Schéma {0} nemůže být odstraněno

h2/src/main/org/h2/res/_messages_de.prop

@@ -83,7 +83,7 @@
 90053=Skalar-Unterabfrage enthält mehr als eine Zeile
 90054=Ungültige Verwendung der Aggregat Funktion {0}
 90055=Chiffre nicht unterstützt: {0}
-90056=Funktion {0}: Ungültiges TO_DATE Format: {1}
+90056=Funktion {0}: Ungültiges Datums-Format: {1}
 90057=Bedingung {0} nicht gefunden
 90058=Innerhalb eines Triggers sind Commit und Rollback ist nicht erlaubt
 90059=Mehrdeutiger Feldname {0}

h2/src/main/org/h2/res/_messages_es.prop

@@ -114,7 +114,7 @@
 90084=Imposible eliminar la ultima columna {0}
 90085=Index {0} pertenece a un constraint {1}
 90086=Class {0} no encontrada
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088=Modo desconocido {0}
 90089=Collation no puede ser cambiado debido a que existe una tabla de datos: {0}
 90090=Schema {0} no puede ser eliminado

h2/src/main/org/h2/res/_messages_ja.prop

@@ -114,7 +114,7 @@
 90084=最後�列 {0} をドロップ�る�������ん
 90085=インデックス {0} �制約�属�����  {1}
 90086=クラス {0} �見��り��ん
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088={0} ��明�モード��
 90089=データテーブル {0} ��る���照�順��変更�����ん
 90090=スキーマ {0} �ドロップ����ん

h2/src/main/org/h2/res/_messages_pl.prop

@@ -114,7 +114,7 @@
 90084=Nie można skasować ostatniej kolumny {0}
 90085=Indeks {0} należy do ograniczenia {1}
 90086=Klasa {0} nie istnieje
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088=Nieznany stan {0}
 90089=Metoda porównywania językowego nie może być zmieniona z powodu istnienia danych w tabeli {0}
 90090=Schemat {0} nie może zostać skasowany

h2/src/main/org/h2/res/_messages_pt_br.prop

@@ -114,7 +114,7 @@
 90084=Não pode apagar a última coluna {0}
 90085=índice {0} pertence a uma restrição {1}
 90086=Classe {0} não foi encontrada
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088=Modo {0} desconhecido
 90089=A coleção não pode ser alterada, porque existe uma tabela de dados: {0}
 90090=Esquema {0} não pode ser apagado

h2/src/main/org/h2/res/_messages_ru.prop

@@ -114,7 +114,7 @@
 90084=�евозможно удалить по�леднее поле {0}
 90085=Индек� {0} отно�ит�� к ограничению {1}
 90086=Кла�� {0} не найден
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088=�еизве�тный режим {0}
 90089=�евозможно изменить collation, пока е�ть данные в таблицах: {0}
 90090=Схема {0} не может быть удалена

h2/src/main/org/h2/res/_messages_sk.prop

@@ -83,6 +83,7 @@
 90053=Skalárny vnorený dopyt (scalar subquery) obsahuje viac ako jeden riadok
 90054=Nesprávne použitie agrega�nej funkcie {0}
 90055=Nepodporovaný typ šifry {0}
+90056=#Function {0}: Invalid date format: {1}
 90057=Obmedzenie (constraint) {0} nenájdený
 90058=Commit alebo Rollback nie je povolené použiť v spúšťa�i (trigger)
 90059=Nejednozna�né meno stĺpca {0}
@@ -113,7 +114,7 @@
 90084=Nemôžem zmazať posledný stĺpec {0}
 90085=Index {0} patrí obmedzeniu (constraint) {1}
 90086=Trieda {0} nenájdená
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088=Neznámy mód {0}
 90089=Kolácia (collation) nemôže byť zmenená pretože tu je dátová tabuľka: {0}
 90090=Schéma {0} nemôže byť zmazaná

h2/src/main/org/h2/res/_messages_zh_cn.prop

@@ -114,7 +114,7 @@
 90084=�能移除最�一个字段 {0}
 90085=索引 {0} 属于一个约� {1}
 90086=找�到类 {0}
-90087=Method {0} with matching arguments not found
+90087=#Method {0} not found
 90088=未知模� {0}
 90089=�能�更整�(Collation),因为存在一个数�表: {0}
 90090=�能删除方案(schema) {0}

h2/src/test/org/h2/samples/newsfeed.sql

@@ -7,6 +7,7 @@
 CREATE TABLE VERSION(ID INT PRIMARY KEY, VERSION VARCHAR, CREATED VARCHAR);
 INSERT INTO VERSION VALUES
 
+(141, '1.4.191', '2016-01-21'),
 (140, '1.4.190', '2015-10-11'),
 (139, '1.4.189', '2015-09-13'),
 (138, '1.4.188', '2015-08-01'),