=== modified file 'ChangeLog'
--- ChangeLog	2010-04-08 09:03:07 +0000
+++ ChangeLog	2010-04-12 14:23:54 +0000
@@ -5,6 +5,8 @@
   * Added connection option INTERACTIVE that tells driver that client is
     ineractive and interactive_timeout has to be used. (Bug #48603)
   * Added parameters arrays support. (Bug #48310)
+  * SQLTables uses now INFORMATION_SCHEMA. Added connection option to use old code.
+    (Bug #43644)
 
   Bugs fixed:
   * If NO_BACKSLASH_ESCAPES mode is used on a server, escaping binary data

=== modified file 'setupgui/windows/odbcdialogparams.cpp'
--- setupgui/windows/odbcdialogparams.cpp	2010-04-11 15:48:48 +0000
+++ setupgui/windows/odbcdialogparams.cpp	2010-04-12 15:01:49 +0000
@@ -253,7 +253,6 @@
   GET_BOOL(METADATA_TAB,   no_catalog);
   GET_BOOL(METADATA_TAB,   limit_column_size);
   GET_BOOL(METADATA_TAB,   no_information_schema);
-  SET_BOOL(METADATA_TAB,   no_information_schema);
 
   /* 3 - Cursors/Results */
   GET_BOOL(CURSORS_TAB,    return_matching_rows);
@@ -309,6 +308,7 @@
   SET_BOOL(METADATA_TAB,   ignore_N_in_name_table);
   SET_BOOL(METADATA_TAB,   no_catalog);
   SET_BOOL(METADATA_TAB,   limit_column_size);
+  SET_BOOL(METADATA_TAB,   no_information_schema);
 
   /* 3 - Cursors/Results */
   SET_BOOL(CURSORS_TAB,    return_matching_rows);
@@ -775,7 +775,7 @@
     if (driver_lookup_name(driver))
     {
       wchar_t msg[256];
-      swprintf(msg, L"Failure to lookup driver entry at path '%ls'",
+      swprintf(msg, 256, L"Failure to lookup driver entry at path '%ls'",
                driver->lib);
       MessageBox(ParentWnd, msg, L"Cannot find driver entry", MB_OK);
       driver_delete(driver);

=== modified file 'util/installer.c'
--- util/installer.c	2010-04-11 15:48:48 +0000
+++ util/installer.c	2010-04-12 14:51:53 +0000
@@ -164,6 +164,7 @@
   {'D','F','L','T','_','B','I','G','I','N','T','_','B','I','N','D','_','S','T','R',0};
 static SQLWCHAR W_CLIENT_INTERACTIVE[]=
   {'I','N','T','E','R','A','C','T','I','V','E',0};
+static SQLWCHAR W_NO_I_S[]= {'N','O','_','I','_','S',0};
 
 /* DS_PARAM */
 /* externally used strings */
@@ -192,7 +193,7 @@
                         W_ZERO_DATE_TO_MIN, W_MIN_DATE_TO_ZERO,
                         W_MULTI_STATEMENTS, W_COLUMN_SIZE_S32,
                         W_NO_BINARY_RESULT, W_DFLT_BIGINT_BIND_STR,
-                        W_CLIENT_INTERACTIVE};
+                        W_CLIENT_INTERACTIVE, W_NO_I_S};
 static const
 int dsnparamcnt= sizeof(dsnparams) / sizeof(SQLWCHAR *);
 /* DS_PARAM */
@@ -801,6 +802,8 @@
     *booldest= &ds->handle_binary_as_char;
   else if (!sqlwcharcasecmp(W_DFLT_BIGINT_BIND_STR, param))
     *booldest= &ds->default_bigint_bind_str;
+  else if (!sqlwcharcasecmp(W_NO_I_S, param))
+    *booldest= &ds->no_information_schema;
 
   /* DS_PARAM */
 }
@@ -1236,6 +1239,7 @@
   if (ds_add_intprop(ds->name, W_COLUMN_SIZE_S32, ds->limit_column_size)) goto error;
   if (ds_add_intprop(ds->name, W_NO_BINARY_RESULT, ds->handle_binary_as_char)) goto error;
   if (ds_add_intprop(ds->name, W_DFLT_BIGINT_BIND_STR, ds->default_bigint_bind_str)) goto error;
+  if (ds_add_intprop(ds->name, W_NO_I_S, ds->no_information_schema)) goto error;
 
   /* DS_PARAM */