Skip to content

Commit 1b07ba5

Browse files
committed
Fix MDEV-8090 in tabmysql.cpp
1 parent f5b05a1 commit 1b07ba5

File tree

6 files changed

+20
-2
lines changed

6 files changed

+20
-2
lines changed
382 KB
Binary file not shown.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
2+
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
3+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
4+
<security>
5+
<requestedPrivileges>
6+
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
7+
</requestedPrivileges>
8+
</security>
9+
</trustInfo>
10+
</assembly>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
La ressource de manifeste a �t� mise � jour pour la derni�re fois � 15:30:20,49 le 24/04/2015
Binary file not shown.
Binary file not shown.

storage/connect/tabmysql.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,9 +1060,16 @@ bool TDBMYSQL::ReadKey(PGLOBAL g, OPVAL op, const void *key, int len)
10601060
int oldlen = Query->GetLength();
10611061

10621062
if (!key || op == OP_NEXT ||
1063-
Mode == MODE_UPDATE || Mode == MODE_DELETE)
1063+
Mode == MODE_UPDATE || Mode == MODE_DELETE) {
1064+
if (!key && Mode == MODE_READX) {
1065+
// This is a false indexed read
1066+
m_Rc = Myc.ExecSQL(g, Query->GetStr());
1067+
Mode = MODE_READ;
1068+
return (m_Rc == RC_FX) ? true : false;
1069+
} // endif key
1070+
10641071
return false;
1065-
else if (op == OP_FIRST) {
1072+
} else if (op == OP_FIRST) {
10661073
if (To_CondFil) {
10671074
oom = Query->Append(" WHERE ");
10681075

0 commit comments

Comments
 (0)