database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

System Versioning 1.0 pre8

Browse Source 
Merge branch '10.3' into trunk
This commit is contained in:
Aleksey Midenkov
2018-01-10 12:36:55 +03:00
parent 26971c9aea 0b597d3ab2
commit c59c1a0736
353 changed files with 12715 additions and 8094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_class.h
View File

@ -373,8 +373,9 @@ public:
typedef struct st_mysql_lock
{
TABLE **table;
uint table_count,lock_count;
THR_LOCK_DATA **locks;
uint table_count,lock_count;
uint flags;
} MYSQL_LOCK;
@ -704,7 +705,7 @@ typedef struct system_variables
uint idle_write_transaction_timeout;
uint column_compression_threshold;
uint column_compression_zlib_level;
ulong in_subquery_conversion_threshold;
uint in_subquery_conversion_threshold;
vers_asof_timestamp_t vers_asof_timestamp;
#ifdef VERS_EXPERIMENTAL
@ -4479,7 +4480,8 @@ public:
const char *path,
const char *db,
const char *table_name,
bool open_in_engine);
bool open_in_engine,
bool open_internal_tables);
TABLE *find_temporary_table(const char *db, const char *table_name);
TABLE *find_temporary_table(const TABLE_LIST *tl);
@ -5586,8 +5588,6 @@ public:
};
/*
Optimizer and executor structure for the materialized semi-join info. This
structure contains