mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge
This commit is contained in:
@ -773,7 +773,7 @@ public:
|
||||
uint current_tablenr,tmp_table;
|
||||
uint server_status,open_options,system_thread;
|
||||
uint32 db_length;
|
||||
uint select_number; //number of select (used for EXPLAIN)
|
||||
int select_number; //number of select (used for EXPLAIN)
|
||||
/* variables.transaction_isolation is reset to this after each commit */
|
||||
enum_tx_isolation session_tx_isolation;
|
||||
enum_check_fields count_cuted_fields;
|
||||
@ -1152,7 +1152,6 @@ class select_union :public select_result {
|
||||
TABLE *table;
|
||||
COPY_INFO info;
|
||||
TMP_TABLE_PARAM tmp_table_param;
|
||||
bool not_describe;
|
||||
|
||||
select_union(TABLE *table_par);
|
||||
~select_union();
|
||||
|
Reference in New Issue
Block a user