The unified diff between revisions [2ed4efc2..] and [ddbdd30e..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "mlsqlite/ocaml-sqlite3.c"
#  from [334cf3064dc352cce5fdc44fbbe2f69104eecba9]
#    to [215cc1e97dd120a746601b54a4ba10fc598ebf98]
#
# patch "ui.ml"
#  from [73769632d6dd3fd7afa9458c342556922970f780]
#    to [89f9af8477b455fc355375fdc5edbc0f7d3a9241]
#
============================================================
--- mlsqlite/ocaml-sqlite3.c	334cf3064dc352cce5fdc44fbbe2f69104eecba9
+++ mlsqlite/ocaml-sqlite3.c	215cc1e97dd120a746601b54a4ba10fc598ebf98
@@ -55,8 +55,8 @@ void ml_sqlite3_raise_exn (int status, c


 
-/* 0 -> trace
- * 1 -> busy
+/* 0 -> busy
+ * 1 -> trace
  * 2 -> progress
  */
 #define NUM_CALLBACKS 3
@@ -227,8 +227,8 @@ ml_sqlite3_sleep (value ms)
 
 /* callbacks */

-#define MLTAG_RETRY 0xc96e9e91L
-#define MLTAG_FAIL  0x5ced03bdL
+#define MLTAG_RETRY -915497327L
+#define MLTAG_FAIL  1559036861L

 static int
 ml_sqlite3_busy_handler_cb (void *data, int num)
@@ -329,15 +329,15 @@ ml_sqlite3_progress_handler_unset (value


 
-#define MLTAG_INTEGER 0x2ddf233dL
-#define MLTAG_FLOAT   0x0109faf9L
-#define MLTAG_TEXT    0x6f75295bL
-#define MLTAG_BLOB    0x57b40abbL
-#define MLTAG_NULL    0x679ecd0fL
+#define MLTAG_INTEGER  769598269L
+#define MLTAG_FLOAT     17431289L
+#define MLTAG_TEXT    1869949275L
+#define MLTAG_BLOB    1471417019L
+#define MLTAG_NULL    1738460431L

-#define MLTAG_INT     0x006f519f
-#define MLTAG_INT64   0x781dd39b
-#define MLTAG_VALUE   0x5f4d6ea3
+#define MLTAG_INT        7295391L
+#define MLTAG_INT64   2015220635L
+#define MLTAG_VALUE   1598910115L

 static value
 convert_sqlite3_type (int t)
@@ -464,8 +464,8 @@ ml_sqlite3_expired (value stmt)
   return Val_bool (s == NULL);
 }

-#define MLTAG_ROW	0x007cfbf5L
-#define MLTAG_DONE	0x5a5d7105L
+#define MLTAG_ROW	   8190965L
+#define MLTAG_DONE	1516073221L

 CAMLprim value
 ml_sqlite3_step (value stmt)
============================================================
--- ui.ml	73769632d6dd3fd7afa9458c342556922970f780
+++ ui.ml	89f9af8477b455fc355375fdc5edbc0f7d3a9241
@@ -325,6 +325,7 @@ module LockedDB = struct
 		())
     end ;
     begin
+      ignore (dialog#connect#close (fun () -> dialog#response `CANCEL)) ;
       dialog#add_button_stock `CANCEL `CANCEL ;
       dialog#add_button "Retry" `RETRY
     end ;