1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

This commit is contained in:
Alexander Barkov
2017-04-07 20:10:18 +04:00
124 changed files with 8380 additions and 639 deletions

View File

@ -699,6 +699,7 @@ typedef struct system_variables
ulong session_track_transaction_info;
my_bool session_track_schema;
my_bool session_track_state_change;
my_bool sequence_read_skip_cache;
ulong threadpool_priority;
@ -2219,6 +2220,8 @@ public:
chapter 'Miscellaneous functions', for functions GET_LOCK, RELEASE_LOCK.
*/
HASH ull_hash;
/* Hash of used seqeunces (for PREVIOUS value) */
HASH sequences;
#ifndef DBUG_OFF
uint dbug_sentry; // watch out for memory corruption
#endif
@ -2423,6 +2426,8 @@ private:
uint binlog_table_maps;
public:
void issue_unsafe_warnings();
void reset_unsafe_warnings()
{ binlog_unsafe_warning_flags= 0; }
uint get_binlog_table_maps() const {
return binlog_table_maps;
@ -5716,6 +5721,14 @@ public:
SP Bulk execution optimized
*/
#define CF_SP_BULK_OPTIMIZED (1U << 20)
/**
If command creates or drops a table
*/
#define CF_SCHEMA_CHANGE (1U << 21)
/**
If command creates or drops a database
*/
#define CF_DB_CHANGE (1U << 22)
/* Bits in server_command_flags */