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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-09 22:04:06 +02:00
parent e9af6b2a4d 16cebed540
commit ef781162ff
266 changed files with 7707 additions and 2404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_type.cc
View File

@ -2293,7 +2293,6 @@ Type_handler_decimal_result::make_num_distinct_aggregator_field(
const Item *item)
const
{
DBUG_ASSERT(item->decimals <= DECIMAL_MAX_SCALE);
return new (mem_root)
Field_new_decimal(NULL, item->max_length,
(uchar *) (item->maybe_null ? "" : 0),