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.5' into bb-10.6-release

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-03 10:47:52 +02:00
parent 212994f704 af143474d8
commit d2f1c3ed6c
449 changed files with 6842 additions and 2256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_type.h
View File

@ -6663,12 +6663,6 @@ public:
bool Item_func_min_max_get_date(THD *thd, Item_func_min_max*,
MYSQL_TIME *, date_mode_t fuzzydate)
const override;
bool Column_definition_set_attributes(THD *thd,
Column_definition *def,
const Lex_field_type_st &attr,
CHARSET_INFO *cs,
column_definition_type_t type)
const override;
};