database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-02 11:35:34 +02:00
parent 866a8ea673 3d23adb766
commit 2719cc4925
420 changed files with 6452 additions and 4162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_statistics.cc
View File

@@ -1789,8 +1789,8 @@ public:
table_field= field;
tree_key_length= field->pack_length();
tree= new Unique((qsort_cmp2) simple_str_key_cmp, (void*) field,
tree_key_length, max_heap_table_size, 1);
tree= new Unique(simple_str_key_cmp, field, tree_key_length,
max_heap_table_size, 1);
}
virtual ~Count_distinct_field()
@@ -1877,13 +1877,13 @@ public:
static
int simple_ulonglong_key_cmp(void* arg, uchar* key1, uchar* key2)
int simple_ulonglong_key_cmp(void*, const void* key1, const void* key2)
{
ulonglong *val1= (ulonglong *) key1;
ulonglong *val2= (ulonglong *) key2;
const ulonglong *val1= static_cast<const ulonglong *>(key1);
const ulonglong *val2= static_cast<const ulonglong *>(key2);
return *val1 > *val2 ? 1 : *val1 == *val2 ? 0 : -1;
}
/*
The class Count_distinct_field_bit is derived from the class
@@ -1900,8 +1900,7 @@ public:
table_field= field;
tree_key_length= sizeof(ulonglong);
tree= new Unique((qsort_cmp2) simple_ulonglong_key_cmp,
(void*) &tree_key_length,
tree= new Unique(simple_ulonglong_key_cmp, &tree_key_length,
tree_key_length, max_heap_table_size, 1);
}