diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-02 15:36:33 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-02 15:36:33 +0200 |
| commit | 1b07ba57a4f05b53db48d89c5954448bbe4e64a3 (patch) | |
| tree | 594fe3f3fc5d6a82bb42c9fabe2747c6da17ebe8 | |
| parent | f5b05a11c1d8f5817b957f5397c288146a348b29 (diff) | |
| download | mariadb-git-1b07ba57a4f05b53db48d89c5954448bbe4e64a3.tar.gz | |
Fix MDEV-8090 in tabmysql.cpp
| -rw-r--r-- | storage/connect/RelWithDebInfo/ha_connect.exp | bin | 0 -> 390776 bytes | |||
| -rw-r--r-- | storage/connect/connect.dir/RelWithDebInfo/ha_connect.dll.intermediate.manifest | 10 | ||||
| -rw-r--r-- | storage/connect/connect.dir/RelWithDebInfo/mt.dep | 1 | ||||
| -rw-r--r-- | storage/connect/connect.dir/RelWithDebInfo/vc90.idb | bin | 0 -> 1002496 bytes | |||
| -rw-r--r-- | storage/connect/connect.dir/RelWithDebInfo/versioninfo_dll.res | bin | 0 -> 392 bytes | |||
| -rw-r--r-- | storage/connect/tabmysql.cpp | 11 |
6 files changed, 20 insertions, 2 deletions
diff --git a/storage/connect/RelWithDebInfo/ha_connect.exp b/storage/connect/RelWithDebInfo/ha_connect.exp Binary files differnew file mode 100644 index 00000000000..270a1ae0b18 --- /dev/null +++ b/storage/connect/RelWithDebInfo/ha_connect.exp diff --git a/storage/connect/connect.dir/RelWithDebInfo/ha_connect.dll.intermediate.manifest b/storage/connect/connect.dir/RelWithDebInfo/ha_connect.dll.intermediate.manifest new file mode 100644 index 00000000000..ecea6f7f567 --- /dev/null +++ b/storage/connect/connect.dir/RelWithDebInfo/ha_connect.dll.intermediate.manifest @@ -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> diff --git a/storage/connect/connect.dir/RelWithDebInfo/mt.dep b/storage/connect/connect.dir/RelWithDebInfo/mt.dep new file mode 100644 index 00000000000..07d724edfa8 --- /dev/null +++ b/storage/connect/connect.dir/RelWithDebInfo/mt.dep @@ -0,0 +1 @@ +La ressource de manifeste a ‚t‚ mise … jour pour la derniŠre fois … 15:30:20,49 le 24/04/2015 diff --git a/storage/connect/connect.dir/RelWithDebInfo/vc90.idb b/storage/connect/connect.dir/RelWithDebInfo/vc90.idb Binary files differnew file mode 100644 index 00000000000..40b22184aad --- /dev/null +++ b/storage/connect/connect.dir/RelWithDebInfo/vc90.idb diff --git a/storage/connect/connect.dir/RelWithDebInfo/versioninfo_dll.res b/storage/connect/connect.dir/RelWithDebInfo/versioninfo_dll.res Binary files differnew file mode 100644 index 00000000000..1482ce4193a --- /dev/null +++ b/storage/connect/connect.dir/RelWithDebInfo/versioninfo_dll.res diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index 66f275796b5..b18e4da2ec4 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -1060,9 +1060,16 @@ bool TDBMYSQL::ReadKey(PGLOBAL g, OPVAL op, const void *key, int len) int oldlen = Query->GetLength(); 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; - else if (op == OP_FIRST) { + } else if (op == OP_FIRST) { if (To_CondFil) { oom = Query->Append(" WHERE "); |