Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1110)
+++ ChangeLog	(working copy)
@@ -3,6 +3,8 @@
   Functionality added or changed:
 
   Bugs fixed:
+  * SQLDriverConnect() returned SQL_ERROR when the user cancelled
+    the dialog box instead of SQL_NO_DATA. (Bug #36293)
 
 ----
 
Index: driver/connect.c
===================================================================
--- driver/connect.c	(revision 1110)
+++ driver/connect.c	(working copy)
@@ -694,7 +694,7 @@
                szConnStrOut, cbConnStrOutMax, pcbConnStrOut))
     {
       set_dbc_error(hdbc, "HY000", "User cancelled.", 0);
-      rc= SQL_ERROR;
+      rc= SQL_NO_DATA;
       goto error;
     }
 
@@ -750,7 +750,7 @@
     if (!pFunc(hdbc, hwnd, oldds))
     {
       set_dbc_error(hdbc, "HY000", "User cancelled.", 0);
-      rc= SQL_ERROR;
+      rc= SQL_NO_DATA;
       goto error;
     }