Bug #34688683 Allow using 32-bit MIT Kerberos for client plugin on windows

WL #15336 added support for using MIT Kerberos to build
authentication_kerberos_client on Windows.
The cmake code assumed 64bit libraries.

Fix cmake code to look for 32bit libraries for 32bit builds.
Also fix some build warnings, and a build break (redefined typedef) for
   typedef SSIZE_T ssize_t;

Change-Id: I30d0b9c434202c3fb51ce8d1c9329abd737038e2

Author: Tor Didriksen

cmake/kerberos.cmake

@@ -179,6 +179,23 @@ IF (WIN32)
     krbcc64.dll
     gssapi64.dll
     )
+    # We still support 32bit build for -DWITHOUT_SERVER=ON
+    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+      SET(CUSTOM_KERBEROS_EXTRA_LIBRARIES
+        k5sprt32.lib
+        comerr32.lib
+        xpprof32.lib
+        krbcc32.lib
+        gssapi32.lib
+        )
+      SET(CUSTOM_KERBEROS_EXTRA_DLLS
+        k5sprt32.dll
+        comerr32.dll
+        xpprof32.dll
+        krbcc32.dll
+        gssapi32.dll
+        )
+    ENDIF()
 ELSE()
   SET(CUSTOM_KERBEROS_EXTRA_LIBRARIES
     com_err
@@ -234,6 +251,23 @@ MACRO(FIND_CUSTOM_KERBEROS)
       NO_CMAKE_ENVIRONMENT_PATH
       NO_SYSTEM_ENVIRONMENT_PATH
       )
+    # We still support 32bit build for -DWITHOUT_SERVER=ON
+    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+      FIND_FILE(KERBEROS_CUSTOM_LIBRARY
+        NAMES krb5_32.lib
+        PATHS ${KERBEROS_ROOT_DIR}/lib
+        NO_CMAKE_PATH
+        NO_CMAKE_ENVIRONMENT_PATH
+        NO_SYSTEM_ENVIRONMENT_PATH
+        )
+      FIND_FILE(KERBEROS_CUSTOM_DLL
+        NAMES krb5_32.dll
+        PATHS ${KERBEROS_ROOT_DIR}/bin
+        NO_CMAKE_PATH
+        NO_CMAKE_ENVIRONMENT_PATH
+        NO_SYSTEM_ENVIRONMENT_PATH
+        )
+    ENDIF()
 
     IF(KERBEROS_INCLUDE_DIR AND KERBEROS_CUSTOM_LIBRARY AND
        KERBEROS_CUSTOM_DLL AND CCAPISERVER_EXECUTABLE)

include/my_inttypes.h

@@ -102,8 +102,12 @@ typedef int myf; /* Type of MyFlags in my_funcs */
 #define MY_INT64_NUM_DECIMAL_DIGITS 21U
 
 #if defined(_WIN32) && !defined(MYSQL_ABI_CHECK)
+#ifndef SSIZE_T_DEFINED
+/* krb5/win-mac.h has a conflicting typedef */
+#define SSIZE_T_DEFINED 1
 typedef SSIZE_T ssize_t;
 #endif
+#endif
 
 /*
   This doesn't really belong here, but it was the only reasonable place

mysys/stacktrace.cc

@@ -434,13 +434,19 @@ void my_print_stacktrace(const uchar * /* stack_bottom */,
   /*Prepare stackframe for the first StackWalk64 call*/
   frame.AddrFrame.Mode = frame.AddrPC.Mode = frame.AddrStack.Mode =
       AddrModeFlat;
-#if (defined _M_X64)
+#if (defined _M_IX86)
+  machine = IMAGE_FILE_MACHINE_I386;
+  frame.AddrFrame.Offset = context.Ebp;
+  frame.AddrPC.Offset = context.Eip;
+  frame.AddrStack.Offset = context.Esp;
+#elif (defined _M_X64)
   machine = IMAGE_FILE_MACHINE_AMD64;
   frame.AddrFrame.Offset = context.Rbp;
   frame.AddrPC.Offset = context.Rip;
   frame.AddrStack.Offset = context.Rsp;
 #else
   /*There is currently no need to support IA64*/
+  /* Warning C4068: unknown pragma 'error' */
 #pragma error("unsupported architecture")
 #endif
 

vio/viosocket.cc

@@ -508,8 +508,14 @@ int vio_shutdown(Vio *vio) {
 #ifndef NDEBUG
 
 #ifdef _WIN32
+#ifdef _WIN64
 #define SOCKET_PRINTF_FORMAT "%llu"
 #else
+#define SOCKET_PRINTF_FORMAT "%lu"
+#endif
+
+#else  // _WIN32
+
 #define SOCKET_PRINTF_FORMAT "%d"
 #endif