diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-07-08 12:20:12 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-07-08 12:20:12 +0200 |
| commit | f3078f01b24bed421c015aec2c1646fa25934c13 (patch) | |
| tree | 7f69241eabef5f755d7ae5b4a0aae6569ce826c1 /storage/connect/tabsys.cpp | |
| parent | ba0abd77172b651a2618eecb212d7baaf7fb8bee (diff) | |
| download | mariadb-git-f3078f01b24bed421c015aec2c1646fa25934c13.tar.gz | |
- Suppressing wrong code (INI tables are not indexables)
modified:
storage/connect/tabsys.cpp
Diffstat (limited to 'storage/connect/tabsys.cpp')
| -rw-r--r-- | storage/connect/tabsys.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/storage/connect/tabsys.cpp b/storage/connect/tabsys.cpp index 6434e011882..c5186f42666 100644 --- a/storage/connect/tabsys.cpp +++ b/storage/connect/tabsys.cpp @@ -223,12 +223,13 @@ bool TDBINI::OpenDB(PGLOBAL g) PINICOL colp; if (Use == USE_OPEN) { +#if 0 if (To_Kindex) /*****************************************************************/ /* Table is to be accessed through a sorted index table. */ /*****************************************************************/ To_Kindex->Reset(); - +#endif // 0 Section = NULL; N = 0; return false; @@ -262,6 +263,7 @@ int TDBINI::ReadDB(PGLOBAL g) /*********************************************************************/ /* Now start the pseudo reading process. */ /*********************************************************************/ +#if 0 // INI tables are not indexable if (To_Kindex) { /*******************************************************************/ /* Reading is by an index table. */ @@ -276,10 +278,11 @@ int TDBINI::ReadDB(PGLOBAL g) case -3: // Same record as last non null one return RC_OK; default: - Section = (char*)recpos; + Section = (char*)recpos; // No good on 64 bit machines } // endswitch recpos } else { +#endif // 0 if (!Section) Section = Seclist; else @@ -289,7 +292,7 @@ int TDBINI::ReadDB(PGLOBAL g) htrc("INI ReadDB: section=%s N=%d\n", Section, N); N++; - } // endif To_Kindex +//} // endif To_Kindex return (*Section) ? RC_OK : RC_EF; } // end of ReadDB @@ -655,6 +658,7 @@ int TDBXIN::ReadDB(PGLOBAL g) /*********************************************************************/ /* Now start the pseudo reading process. */ /*********************************************************************/ +#if 0 // XIN tables are not indexable if (To_Kindex) { /*******************************************************************/ /* Reading is by an index table. */ @@ -673,6 +677,7 @@ int TDBXIN::ReadDB(PGLOBAL g) } // endswitch recpos } else { +#endif // 0 do { if (!Keycur || !*Keycur) { if (!Section) @@ -691,7 +696,7 @@ int TDBXIN::ReadDB(PGLOBAL g) } while (!*Keycur); N++; - } // endif To_Kindex +//} // endif To_Kindex return RC_OK; } // end of ReadDB |