1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fix a few GCC errors an warnings

Browse Source 
modified:
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
This commit is contained in:
Olivier Bertrand 2014-02-03 23:07:49 +01:00
parent 5133cb5e25
commit a25b5bd440
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/ha_connect.cc
View File

@ -3141,7 +3141,7 @@ int ha_connect::external_lock(THD *thd, int lock_type)
DBUG_ASSERT(thd == current_thd); DBUG_ASSERT(thd == current_thd);
if (xtrace) 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); this, thd, xp, g, lock_type);
if (!g) if (!g)
@ -4920,7 +4920,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
} // endif } // endif
if (xtrace) 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 // To check whether indices have to be made or remade
if (!g->Xchk) { if (!g->Xchk) {

8
storage/connect/mycat.cc
View File

@ -98,6 +98,8 @@ extern "C" HINSTANCE s_hModule; // Saved module handle
extern int xtrace; extern int xtrace;
PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info);
/***********************************************************************/ /***********************************************************************/
/* Get a unique enum table type ID. */ /* 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) 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; const char *module, *subtype;
char c, getname[40] = "Col"; char c, getname[40] = "Col";
#if defined(WIN32) #if defined(WIN32)
@ -312,9 +314,9 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info)
const char *error = NULL; const char *error = NULL;
// Load the desired shared library // Load the desired shared library
if (!(hdll = dlopen(Module, RTLD_LAZY))) { if (!(hdll = dlopen(module, RTLD_LAZY))) {
error = dlerror(); error = dlerror();
sprintf(g->Message, MSG(SHARED_LIB_ERR), Module, SVP(error)); sprintf(g->Message, MSG(SHARED_LIB_ERR), module, SVP(error));
return NULL; return NULL;
} // endif Hdll } // endif Hdll