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 loosing result lines when all of this is true:

Browse Source 
The table type is MYSQL
  The query where clause includes an indexed column
  The where clause contains < or <= operator on this column
Change version date
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/tabmysql.cpp

Add visual studio 2013 files to ignore
  modified:   .gitignore
This commit is contained in:
Olivier Bertrand
2015-07-06 12:33:11 +02:00
parent 8e524d2f84
commit f07359349f
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -281,6 +281,10 @@ storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
*.vcproj.* *.vcproj.*
*.vcproj.*.* *.vcproj.*.*
*.vcproj.*.*.* *.vcproj.*.*.*
*.vcxproj
*.vcxproj.*
*.vcxproj.*.*
*.vcxproj.*.*.*
# Build results # Build results
[Dd]ebug/ [Dd]ebug/

6
storage/connect/ha_connect.cc
View File

@@ -169,7 +169,7 @@
#define JSONMAX 10 // JSON Default max grp size #define JSONMAX 10 // JSON Default max grp size
extern "C" { extern "C" {
char version[]= "Version 1.03.0007 June 03, 2015"; char version[]= "Version 1.03.0007 July 05, 2015";
#if defined(__WIN__) #if defined(__WIN__)
char compver[]= "Version 1.03.0007 " __DATE__ " " __TIME__; char compver[]= "Version 1.03.0007 " __DATE__ " " __TIME__;
char slash= '\\'; char slash= '\\';
@@ -2237,7 +2237,9 @@ bool ha_connect::MakeKeyWhere(PGLOBAL g, PSTRG qry, OPVAL op, char q,
case OP_EQ: case OP_EQ:
case OP_GT: case OP_GT:
case OP_GE: case OP_GE:
oom|= qry->Append((PSZ)GetValStr(op, false)); case OP_LT:
case OP_LE:
oom |= qry->Append((PSZ)GetValStr(op, false));
break; break;
default: default:
oom|= qry->Append(" ??? "); oom|= qry->Append(" ??? ");

30
storage/connect/tabmysql.cpp
View File

@@ -1059,27 +1059,35 @@ bool TDBMYSQL::ReadKey(PGLOBAL g, OPVAL op, const void *key, int len)
bool oom; bool oom;
int oldlen = Query->GetLength(); int oldlen = Query->GetLength();
if (op == OP_FIRST) {
#ifdef _DEBUG
assert(!key);
#endif
key_range *end_key = &To_Def->GetHandler()->save_end_range;
key = end_key->key;
len = end_key->length;
switch (end_key->flag) {
case HA_READ_BEFORE_KEY: op = OP_LT; break;
case HA_READ_AFTER_KEY: op = OP_LE; break;
default: key = NULL;
} // endswitch flag
} // endif OP_FIRST
if (!key || op == OP_NEXT || if (!key || op == OP_NEXT ||
Mode == MODE_UPDATE || Mode == MODE_DELETE) { Mode == MODE_UPDATE || Mode == MODE_DELETE) {
#if 0
if (!key && Mode == MODE_READX) { if (!key && Mode == MODE_READX) {
// This is a false indexed read // This is a false indexed read
m_Rc = Myc.ExecSQL(g, Query->GetStr()); m_Rc = Myc.ExecSQL(g, Query->GetStr());
Mode = MODE_READ; Mode = MODE_READ;
return (m_Rc == RC_FX) ? true : false; return (m_Rc == RC_FX) ? true : false;
} // endif key } // endif key
#endif // 0
return false; return false;
} else if (op == OP_FIRST) {
if (To_CondFil) {
oom = Query->Append(" WHERE ");
if ((oom |= Query->Append(To_CondFil->Body))) {
strcpy(g->Message, "Readkey: Out of memory");
return true;
} // endif oom
} // endif To_Condfil
} else { } else {
if (Myc.m_Res) if (Myc.m_Res)
Myc.FreeResult(); Myc.FreeResult();