@@ -1114,7 +1114,7 @@ int GetIntegerTableOption(PGLOBAL g, PTOS options, char *opname, int idef)
1114
1114
else if (!stricmp (opname, " Compressed" ))
1115
1115
opval= (options->compressed );
1116
1116
1117
- if (opval == NO_IVAL) {
1117
+ if (opval == (ulonglong) NO_IVAL) {
1118
1118
char *pv;
1119
1119
1120
1120
if ((pv= GetListOption (g, opname, options->oplist )))
@@ -4427,15 +4427,16 @@ int ha_connect::external_lock(THD *thd, int lock_type)
4427
4427
xmod= MODE_ANY; // For info commands
4428
4428
DBUG_RETURN (rc);
4429
4429
} // endif MODE_ANY
4430
-
4431
- DBUG_ASSERT (table && table->s );
4432
-
4430
+ else
4433
4431
if (check_privileges (thd, options, table->s ->db .str )) {
4434
4432
strcpy (g->Message , " This operation requires the FILE privilege" );
4435
4433
htrc (" %s\n " , g->Message );
4436
4434
DBUG_RETURN (HA_ERR_INTERNAL_ERROR);
4437
4435
} // endif check_privileges
4438
4436
4437
+
4438
+ DBUG_ASSERT (table && table->s );
4439
+
4439
4440
// Table mode depends on the query type
4440
4441
newmode= CheckMode (g, thd, newmode, &xcheck, &cras);
4441
4442
@@ -5028,7 +5029,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
5028
5029
char *nsp= NULL , *cls= NULL ;
5029
5030
#endif // __WIN__
5030
5031
int port= 0 , hdr= 0 , mxr= 0 , mxe= 0 , rc= 0 ;
5031
- int cop __attribute__ ((unused))= 0 , lrecl= 0 ;
5032
+ int cop __attribute__ ((unused))= 0 ;
5032
5033
#if defined(ODBC_SUPPORT)
5033
5034
POPARM sop = NULL ;
5034
5035
char *ucnc = NULL ;
@@ -5074,7 +5075,6 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
5074
5075
hdr= (int )topt->header ;
5075
5076
tbl= topt->tablist ;
5076
5077
col= topt->colist ;
5077
- lrecl= (int )topt->lrecl ;
5078
5078
5079
5079
if (topt->oplist ) {
5080
5080
host= GetListOption (g, " host" , topt->oplist , " localhost" );
0 commit comments