database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

merge 10.2->10.3 with conflict resolutions

Browse Source
This commit is contained in:
Andrei Elkin
2019-11-11 16:28:21 +02:00
parent 4fcfdb60e7 26fd880d5e
commit d103c5a489
10 changed files with 290 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/table.h
View File

@@ -1481,6 +1481,7 @@ public:
bool is_filled_at_execution();
bool update_const_key_parts(COND *conds);
void initialize_quick_structures();
my_ptrdiff_t default_values_offset() const
{ return (my_ptrdiff_t) (s->default_values - record[0]); }