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

- Suppressing wrong code (INI tables are not indexables)

Browse Source 
modified:
  storage/connect/tabsys.cpp
This commit is contained in:
Olivier Bertrand 2013-07-08 12:20:12 +02:00
parent ba0abd7717
commit f3078f01b2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/connect/tabsys.cpp
View File

@ -223,12 +223,13 @@ bool TDBINI::OpenDB(PGLOBAL g)
PINICOL colp; PINICOL colp;
if (Use == USE_OPEN) { if (Use == USE_OPEN) {
#if 0
if (To_Kindex) if (To_Kindex)
/*****************************************************************/ /*****************************************************************/
/* Table is to be accessed through a sorted index table. */ /* Table is to be accessed through a sorted index table. */
/*****************************************************************/ /*****************************************************************/
To_Kindex->Reset(); To_Kindex->Reset();
#endif // 0
Section = NULL; Section = NULL;
N = 0; N = 0;
return false; return false;
@ -262,6 +263,7 @@ int TDBINI::ReadDB(PGLOBAL g)
/*********************************************************************/ /*********************************************************************/
/* Now start the pseudo reading process. */ /* Now start the pseudo reading process. */
/*********************************************************************/ /*********************************************************************/
#if 0 // INI tables are not indexable
if (To_Kindex) { if (To_Kindex) {
/*******************************************************************/ /*******************************************************************/
/* Reading is by an index table. */ /* Reading is by an index table. */
@ -276,10 +278,11 @@ int TDBINI::ReadDB(PGLOBAL g)
case -3: // Same record as last non null one case -3: // Same record as last non null one
return RC_OK; return RC_OK;
default: default:
Section = (char*)recpos; Section = (char*)recpos; // No good on 64 bit machines
} // endswitch recpos } // endswitch recpos
} else { } else {
#endif // 0
if (!Section) if (!Section)
Section = Seclist; Section = Seclist;
else else
@ -289,7 +292,7 @@ int TDBINI::ReadDB(PGLOBAL g)
htrc("INI ReadDB: section=%s N=%d\n", Section, N); htrc("INI ReadDB: section=%s N=%d\n", Section, N);
N++; N++;
} // endif To_Kindex //} // endif To_Kindex
return (*Section) ? RC_OK : RC_EF; return (*Section) ? RC_OK : RC_EF;
} // end of ReadDB } // end of ReadDB
@ -655,6 +658,7 @@ int TDBXIN::ReadDB(PGLOBAL g)
/*********************************************************************/ /*********************************************************************/
/* Now start the pseudo reading process. */ /* Now start the pseudo reading process. */
/*********************************************************************/ /*********************************************************************/
#if 0 // XIN tables are not indexable
if (To_Kindex) { if (To_Kindex) {
/*******************************************************************/ /*******************************************************************/
/* Reading is by an index table. */ /* Reading is by an index table. */
@ -673,6 +677,7 @@ int TDBXIN::ReadDB(PGLOBAL g)
} // endswitch recpos } // endswitch recpos
} else { } else {
#endif // 0
do { do {
if (!Keycur || !*Keycur) { if (!Keycur || !*Keycur) {
if (!Section) if (!Section)
@ -691,7 +696,7 @@ int TDBXIN::ReadDB(PGLOBAL g)
} while (!*Keycur); } while (!*Keycur);
N++; N++;
} // endif To_Kindex //} // endif To_Kindex
return RC_OK; return RC_OK;
} // end of ReadDB } // end of ReadDB