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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-10-22 13:27:18 +03:00
parent 1619ae8990 e3d692aa09
commit 46957a6a77
144 changed files with 2477 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.h
View File

@ -275,8 +275,9 @@ class Key_part_spec :public Sql_alloc {
public:
LEX_CSTRING field_name;
uint length;
Key_part_spec(const LEX_CSTRING *name, uint len)
: field_name(*name), length(len)
bool generated;
Key_part_spec(const LEX_CSTRING *name, uint len, bool gen= false)
: field_name(*name), length(len), generated(gen)
{}
bool operator==(const Key_part_spec& other) const;
/**
@ -6491,11 +6492,11 @@ public:
/**
SP Bulk execution safe
*/
#define CF_SP_BULK_SAFE (1U << 20)
#define CF_PS_ARRAY_BINDING_SAFE (1U << 20)
/**
SP Bulk execution optimized
*/
#define CF_SP_BULK_OPTIMIZED (1U << 21)
#define CF_PS_ARRAY_BINDING_OPTIMIZED (1U << 21)
/**
If command creates or drops a table
*/