diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 4533c628686..ae625c504e4 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -3141,7 +3141,7 @@ int ha_connect::external_lock(THD *thd, int lock_type) DBUG_ASSERT(thd == current_thd); if (xtrace) - printf("external_lock: this=%p thd=%p xp=%d g=%p lock_type=%d\n", + printf("external_lock: this=%p thd=%p xp=%p g=%p lock_type=%d\n", this, thd, xp, g, lock_type); if (!g) @@ -4920,7 +4920,7 @@ int ha_connect::create(const char *name, TABLE *table_arg, } // endif if (xtrace) - printf("xchk=%d createas=%d\n", g->Xchk, g->Createas); + printf("xchk=%p createas=%d\n", g->Xchk, g->Createas); // To check whether indices have to be made or remade if (!g->Xchk) { diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index dc5db156af0..5b5bf4d3000 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -98,6 +98,8 @@ extern "C" HINSTANCE s_hModule; // Saved module handle extern int xtrace; +PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info); + /***********************************************************************/ /* Get a unique enum table type ID. */ /***********************************************************************/ @@ -264,7 +266,7 @@ uint GetFuncID(const char *func) /***********************************************************************/ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info) { - typedef PQRYRES (__stdcall *XCOLDEF) (PGLOBAL, PVOID, char*, char*, bool); + typedef PQRYRES (__stdcall *XCOLDEF) (PGLOBAL, void*, char*, char*, bool); const char *module, *subtype; char c, getname[40] = "Col"; #if defined(WIN32) @@ -312,9 +314,9 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info) const char *error = NULL; // Load the desired shared library - if (!(hdll = dlopen(Module, RTLD_LAZY))) { + if (!(hdll = dlopen(module, RTLD_LAZY))) { error = dlerror(); - sprintf(g->Message, MSG(SHARED_LIB_ERR), Module, SVP(error)); + sprintf(g->Message, MSG(SHARED_LIB_ERR), module, SVP(error)); return NULL; } // endif Hdll