database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

compiler warnings

Browse Source
This commit is contained in:
Sergei Golubchik
2013-06-03 14:43:47 +02:00
parent 1fe92fb87d
commit 0a01953c1a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/connect/ha_connect.cc
View File

@ -693,8 +693,8 @@ char *ha_connect::GetStringOption(char *opname, char *sdef)
opval= (char*)GetDBName(NULL); // Current database
else if (!stricmp(opname, "Type")) // Default type
opval= (!options) ? NULL :
(options->srcdef) ? "MYSQL" :
(options->tabname) ? "PROXY" : "DOS";
(options->srcdef) ? (char*)"MYSQL" :
(options->tabname) ? (char*)"PROXY" : (char*)"DOS";
else if (!stricmp(opname, "User")) // Connected user
opval= (char *) "root";
else if (!stricmp(opname, "Host")) // Connected user host
@ -792,7 +792,7 @@ int ha_connect::GetIntegerOption(char *opname)
else if (!stricmp(opname, "Compressed"))
opval= (options->compressed);
if (opval == NO_IVAL && options && options->oplist)
if (opval == (ulonglong)NO_IVAL && options && options->oplist)
if ((pv= GetListOption(xp->g, opname, options->oplist)))
opval= (unsigned)atoll(pv);
@ -2799,7 +2799,7 @@ bool ha_connect::IsSameIndex(PIXDEF xp1, PIXDEF xp2)
int ha_connect::external_lock(THD *thd, int lock_type)
{
int rc= 0;
bool del= false, xcheck=false, cras= false;
bool xcheck=false, cras= false;
MODE newmode;
PTOS options= GetTableOptionStruct(table);
PGLOBAL g= GetPlug(thd, xp);
@ -2949,7 +2949,6 @@ int ha_connect::external_lock(THD *thd, int lock_type)
// break;
case SQLCOM_DELETE:
case SQLCOM_DELETE_MULTI:
del= true;
case SQLCOM_TRUNCATE:
newmode= MODE_DELETE;
break;
@ -3207,7 +3206,7 @@ int ha_connect::delete_or_rename_table(const char *name, const char *to)
/* We have to retrieve the information about this table options. */
ha_table_option_struct *pos;
char key[MAX_DBKEY_LENGTH], db[128], tabname[128];
int rc;
int rc = 0;
uint key_length;
TABLE_SHARE *share;
THD *thd= current_thd;
@ -3253,7 +3252,7 @@ int ha_connect::delete_or_rename_table(const char *name, const char *to)
err:
free_table_share(share);
fin:
DBUG_RETURN(0);
DBUG_RETURN(rc);
} // end of delete_or_rename_table
int ha_connect::delete_table(const char *name)

4
storage/connect/tabutil.cpp
View File

@ -78,8 +78,8 @@ TABLE_SHARE *GetTableShare(PGLOBAL g, THD *thd, const char *db,
//table_list.init_one_table(db, strlen(db), name, strlen(name),
// NULL, TL_IGNORE);
k = sprintf(key, "%s", db);
k += sprintf(key + ++k, "%s", name);
k = sprintf(key, "%s", db) + 1;
k += sprintf(key + k, "%s", name);
key[++k] = 0;
if (!(s = alloc_table_share(db, name, key, ++k))) {