database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

- Correct misplaced parenthesis in last change

Browse Source 
modified:
  storage/connect/ha_connect.cc

- Tdbp must be assigned before calling PRX column init

modified:
  storage/connect/tabtbl.cpp
This commit is contained in:
Olivier Bertrand
2013-05-20 18:17:09 +02:00
parent 38a5bb2c1b
commit ca024d1c21
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/ha_connect.cc
View File

@@ -1094,9 +1094,9 @@ PTDB ha_connect::GetTDB(PGLOBAL g)
table_name= GetTableName();
if (!xp->CheckQuery(valid_query_id && tdbp
if (!xp->CheckQuery(valid_query_id) && tdbp
&& !stricmp(tdbp->GetName(), table_name)
&& tdbp->GetMode() == xmod)) {
&& tdbp->GetMode() == xmod) {
tp= tdbp;
tp->SetMode(xmod);
} else if ((tp= CntGetTDB(g, table_name, xmod, this)))

3
storage/connect/tabtbl.cpp
View File

@@ -216,7 +216,6 @@ bool TDBTBL::InitTableList(PGLOBAL g)
{
int n;
PTABLE tp, tabp;
PTDBASE tdbp;
PCOL colp;
PTBLDEF tdp = (PTBLDEF)To_Def;
@@ -227,7 +226,7 @@ bool TDBTBL::InitTableList(PGLOBAL g)
tabp = new(g) XTAB(tp);
// Get the table description block of this table
if (!(tdbp = GetSubTable(g, tabp))) {
if (!(Tdbp = GetSubTable(g, tabp))) {
if (++Nbf > Maxerr)
return TRUE; // Error return
else