database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix MDEV-8090 in tabmysql.cpp

Browse Source
This commit is contained in:
Olivier Bertrand
2015-05-02 15:36:33 +02:00
parent f5b05a11c1
commit 1b07ba57a4
6 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
storage/connect/RelWithDebInfo/ha_connect.exp Normal file
View File

Binary file not shown.

10
storage/connect/connect.dir/RelWithDebInfo/ha_connect.dll.intermediate.manifest Normal file
View File

@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

1
storage/connect/connect.dir/RelWithDebInfo/mt.dep Normal file
View File

@@ -0,0 +1 @@
La ressource de manifeste a <20>t<EFBFBD> mise <20> jour pour la derni<6E>re fois <20> 15:30:20,49 le 24/04/2015

BIN
storage/connect/connect.dir/RelWithDebInfo/vc90.idb Normal file
View File

Binary file not shown.

BIN
storage/connect/connect.dir/RelWithDebInfo/versioninfo_dll.res Normal file
View File

Binary file not shown.

11
storage/connect/tabmysql.cpp
View File

@@ -1060,9 +1060,16 @@ bool TDBMYSQL::ReadKey(PGLOBAL g, OPVAL op, const void *key, int len)
int oldlen = Query->GetLength(); int oldlen = Query->GetLength();
if (!key || op == OP_NEXT || if (!key || op == OP_NEXT ||
Mode == MODE_UPDATE || Mode == MODE_DELETE) Mode == MODE_UPDATE || Mode == MODE_DELETE) {
if (!key && Mode == MODE_READX) {
// This is a false indexed read
m_Rc = Myc.ExecSQL(g, Query->GetStr());
Mode = MODE_READ;
return (m_Rc == RC_FX) ? true : false;
} // endif key
return false; return false;
else if (op == OP_FIRST) { } else if (op == OP_FIRST) {
if (To_CondFil) { if (To_CondFil) {
oom = Query->Append(" WHERE "); oom = Query->Append(" WHERE ");