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 regression bug on "select max(length(nom)) from emp1" when:

Browse Source 
The emp1 table type is MYSQL
  nom is an indexed column
This commit is contained in:
Olivier Bertrand
2015-07-07 15:55:32 +02:00
parent f07359349f
commit 6114101344
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/connect/tabmysql.cpp
View File

@@ -1058,12 +1058,13 @@ bool TDBMYSQL::ReadKey(PGLOBAL g, OPVAL op, const void *key, int len)
{ {
bool oom; bool oom;
int oldlen = Query->GetLength(); int oldlen = Query->GetLength();
PHC hc = To_Def->GetHandler();
if (op == OP_FIRST) { if (op == OP_FIRST && hc->end_range) {
#ifdef _DEBUG #ifdef _DEBUG
assert(!key); assert(!key);
#endif #endif
key_range *end_key = &To_Def->GetHandler()->save_end_range; key_range *end_key = &hc->save_end_range;
key = end_key->key; key = end_key->key;
len = end_key->length; len = end_key->length;
@@ -1078,21 +1079,20 @@ bool TDBMYSQL::ReadKey(PGLOBAL g, OPVAL op, const void *key, int len)
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 { } else {
if (Myc.m_Res) if (Myc.m_Res)
Myc.FreeResult(); Myc.FreeResult();
To_Def->GetHandler()->MakeKeyWhere(g, Query, op, '`', key, len); if (hc->MakeKeyWhere(g, Query, op, '`', key, len))
return true;
if (To_CondFil) { if (To_CondFil) {
oom = Query->Append(" AND ("); oom = Query->Append(" AND (");