database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-12 12:25:37 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-03 19:57:29 +03:00
parent cad56fbaba 1f3bcff1f2
commit 28636a92ed
4 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/federated/ha_federated.h
View File

@@ -89,7 +89,6 @@ class ha_federated: public handler
*/
DYNAMIC_ARRAY results;
bool position_called, table_will_be_deleted;
uint fetch_num; // stores the fetch num
MYSQL_ROW_OFFSET current_position; // Current position used by ::position()
int remote_error_number;
char remote_error_buf[FEDERATED_QUERY_BUFFER_SIZE];

1
storage/federatedx/ha_federatedx.h
View File

@@ -270,7 +270,6 @@ class ha_federatedx: public handler
*/
DYNAMIC_ARRAY results;
bool position_called;
uint fetch_num; // stores the fetch num
int remote_error_number;
char remote_error_buf[FEDERATEDX_QUERY_BUFFER_SIZE];
bool ignore_duplicates, replace_duplicates;

1
storage/innobase/trx/trx0rec.cc
View File

@@ -1681,7 +1681,6 @@ trx_undo_rec_get_partial_row(
bool first_v_col = true;
bool is_undo_log = true;
ut_ad(ptr);
ut_ad(dict_index_is_clust(index));
*row = dtuple_create_with_vcol(

1
storage/xtradb/trx/trx0rec.cc
View File

@@ -1087,7 +1087,6 @@ trx_undo_rec_get_partial_row(
const byte* end_ptr;
ulint row_len;
ut_ad(ptr);
ut_ad(dict_index_is_clust(index));
row_len = dict_table_get_n_cols(index->table);