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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-11-02 15:48:47 +02:00
parent d5ce782444 8036d0a359
commit c7f322c91f
32 changed files with 1636 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/opt_split.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2017 MariaDB
Copyright (c) 2017, 2020, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -751,13 +751,13 @@ void JOIN::add_keyuses_for_splitting()
added_keyuse_count))
goto err;
memcpy(keyuse.buffer,
save_qep->keyuse.buffer,
(size_t) save_qep->keyuse.elements * keyuse.size_of_element);
keyuse.elements= save_qep->keyuse.elements;
idx= keyuse.elements= save_qep->keyuse.elements;
if (keyuse.elements)
memcpy(keyuse.buffer,
save_qep->keyuse.buffer,
(size_t) keyuse.elements * keyuse.size_of_element);
keyuse_ext= &ext_keyuses_for_splitting->at(0);
idx= save_qep->keyuse.elements;
for (i=0; i < added_keyuse_count; i++, keyuse_ext++, idx++)
{
set_dynamic(&keyuse, (KEYUSE *) keyuse_ext, idx);