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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-11-29 12:37:46 +02:00
parent 19acb0257e fdb6db6b47
commit 7d4077cc11
246 changed files with 2643 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_sort.h
View File

@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_base.h" /* ha_rows */
#include <my_sys.h> /* qsort2_cmp */
#include <my_cmp.h>
#include "queues.h"
#include "sql_string.h"
#include "sql_class.h"
@@ -567,7 +567,7 @@ public:
bool not_killable;
String tmp_buffer;
// The fields below are used only by Unique class.
qsort2_cmp compare;
qsort_cmp2 compare;
BUFFPEK_COMPARE_CONTEXT cmp_context;
Sort_param()
@@ -673,7 +673,7 @@ public:
void try_to_pack_sortkeys();
qsort2_cmp get_compare_function() const
qsort_cmp2 get_compare_function() const
{
return using_packed_sortkeys() ?
get_packed_keys_compare_ptr() :