mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Fixed compiler warnings from connect engine
- clang complains about register in C++ - Removed not used variables - Fixed bug when printing date in filamdbf.cpp - Added {} to fix warning about dangling else - Changed connect_done_func() to be global to remove conflict with header files - Added extra () around assignment in if
This commit is contained in:
@@ -378,7 +378,7 @@ bool TDBJDBC::MakeInsert(PGLOBAL g)
|
||||
int len = 0;
|
||||
uint pos;
|
||||
bool b = false;
|
||||
PTABLE tablep = To_Table;
|
||||
// PTABLE tablep = To_Table;
|
||||
PCOL colp;
|
||||
|
||||
for (colp = Columns; colp; colp = colp->GetNext())
|
||||
@@ -582,11 +582,13 @@ bool TDBJDBC::OpenDB(PGLOBAL g)
|
||||
if (Memory < 3) {
|
||||
// Method will depend on cursor type
|
||||
if ((Rbuf = Query ? Jcp->Rewind(Query->GetStr()) : 0) < 0)
|
||||
{
|
||||
if (Mode != MODE_READX) {
|
||||
Jcp->Close();
|
||||
return true;
|
||||
} else
|
||||
Rbuf = 0;
|
||||
}
|
||||
|
||||
} else
|
||||
Rbuf = Qrp->Nblin;
|
||||
@@ -1017,7 +1019,7 @@ JDBCCOL::JDBCCOL(JDBCCOL *col1, PTDB tdbp) : EXTCOL(col1, tdbp)
|
||||
void JDBCCOL::ReadColumn(PGLOBAL g)
|
||||
{
|
||||
PTDBJDBC tdbp = (PTDBJDBC)To_Tdb;
|
||||
int i = tdbp->Fpos - 1, n = tdbp->CurNum;
|
||||
int i = tdbp->Fpos - 1;
|
||||
|
||||
if (tdbp->Memory == 3) {
|
||||
// Get the value from the stored memory
|
||||
@@ -1137,8 +1139,6 @@ int TDBXJDC::GetMaxSize(PGLOBAL g)
|
||||
/***********************************************************************/
|
||||
bool TDBXJDC::OpenDB(PGLOBAL g)
|
||||
{
|
||||
bool rc = false;
|
||||
|
||||
if (trace(1))
|
||||
htrc("JDBC OpenDB: tdbp=%p tdb=R%d use=%d mode=%d\n",
|
||||
this, Tdb_No, Use, Mode);
|
||||
|
Reference in New Issue
Block a user