Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
f3078f01
Commit
f3078f01
authored
Jul 08, 2013
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Suppressing wrong code (INI tables are not indexables)
modified: storage/connect/tabsys.cpp
parent
ba0abd77
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
storage/connect/tabsys.cpp
storage/connect/tabsys.cpp
+9
-4
No files found.
storage/connect/tabsys.cpp
View file @
f3078f01
...
@@ -223,12 +223,13 @@ bool TDBINI::OpenDB(PGLOBAL g)
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment