- Commit merged file (on Linux)

modified:
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/odbccat.h
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
  storage/connect/tabmul.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
  
- Fix typo error in TDBDIR::CloseDB

modified:
  storage/connect/tabmul.cpp

- Fix format in TDBXDBC::MakeCMD (was not accepted on Linux)

modified:
  storage/connect/tabodbc.cpp

storage/connect/tabmul.cpp

@@ -884,9 +884,11 @@ void TDBDIR::CloseDB(PGLOBAL g)
   _findclose(Hsearch);
   Hsearch = -1;
 #else   // !WIN32
-  // Close the DIR handle.
-  closedir(Dir);
-  Dir = NULL;
+  // Close the DIR handle
+  if (Dir) {
+    closedir(Dir);
+    Dir = NULL;
+    } // endif dir
 #endif  // !WIN32
   iFile = 0;
   } // end of CloseDB