database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2018-10-05 08:09:49 +03:00
parent 55dd077656 941ca92a2c
commit 444c380ceb
464 changed files with 10228 additions and 197067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.h
View File

@ -3097,7 +3097,7 @@ public:
bool keyread_enabled() { return keyread < MAX_KEY; }
int ha_start_keyread(uint idx)
{
int res= keyread_enabled() ? 0 : extra(HA_EXTRA_KEYREAD);
int res= keyread_enabled() ? 0 : extra_opt(HA_EXTRA_KEYREAD, idx);
keyread= idx;
return res;
}
@ -3609,7 +3609,7 @@ public:
{ return 0; }
virtual int extra(enum ha_extra_function operation)
{ return 0; }
virtual int extra_opt(enum ha_extra_function operation, ulong cache_size)
virtual int extra_opt(enum ha_extra_function operation, ulong arg)
{ return extra(operation); }
/**