Merge 10.1 into 10.2

MariaDB · Apr 3, 2019 · 28636a9 · 28636a9
2 parents cad56fb + 1f3bcff
commit 28636a9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
@@ -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];

diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h
@@ -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;

diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc
@@ -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(

diff --git a/storage/xtradb/trx/trx0rec.cc b/storage/xtradb/trx/trx0rec.cc
@@ -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);