diff options
| -rw-r--r-- | sql/field.cc | 8 | ||||
| -rw-r--r-- | sql/sql_statistics.cc | 7 | ||||
| -rw-r--r-- | storage/innobase/include/btr0btr.h | 31 | ||||
| -rw-r--r-- | storage/innobase/include/btr0btr.ic | 30 |
4 files changed, 6 insertions, 70 deletions
diff --git a/sql/field.cc b/sql/field.cc index 1e1de972e86..3a9b2257748 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -71,7 +71,7 @@ const char field_separator=','; ptr < table->record[0] + table->s->reclength)))) #define ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED \ - DBUG_ASSERT(!table || \ + DBUG_ASSERT(!table || \ (!table->write_set || \ bitmap_is_set(table->write_set, field_index) || \ (!(ptr >= table->record[0] && \ @@ -1766,7 +1766,7 @@ Field::Field(uchar *ptr_arg,uint32 length_arg,uchar *null_ptr_arg, flags=null_ptr ? 0: NOT_NULL_FLAG; comment.str= (char*) ""; comment.length=0; - field_index= 0; + field_index= 0; cond_selectivity= 1.0; next_equal_field= NULL; } @@ -11380,8 +11380,8 @@ void Field::set_warning_truncated_wrong_value(const char *type_arg, DBUG_ASSERT(table); db_name= (table && table->s->db.str) ? table->s->db.str : ""; - table_name= ((table && table->s->table_name.str) ? table->s->table_name.str : - ""); + table_name= (table && table->s->table_name.str) ? + table->s->table_name.str : ""; push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index 59ae111f716..50f7446f38a 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -1155,18 +1155,12 @@ public: case COLUMN_STAT_MIN_VALUE: table_field->read_stats->min_value->set_notnull(); stat_field->val_str(&val); -#if 0 /* MDEV-20589 FIXME: This fails! */ - DBUG_ASSERT(table_field->read_stats->min_value->is_stat_field); -#endif table_field->read_stats->min_value->store(val.ptr(), val.length(), &my_charset_bin); break; case COLUMN_STAT_MAX_VALUE: table_field->read_stats->max_value->set_notnull(); stat_field->val_str(&val); -#if 0 /* MDEV-20589 FIXME: This fails! */ - DBUG_ASSERT(table_field->read_stats->min_value->is_stat_field); -#endif table_field->read_stats->max_value->store(val.ptr(), val.length(), &my_charset_bin); break; @@ -2995,6 +2989,7 @@ int read_statistics_for_table(THD *thd, TABLE *table, TABLE_LIST *stat_tables) TABLE_SHARE *table_share= table->s; Table_statistics *read_stats= table_share->stats_cb.table_stats; enum_check_fields old_check_level= thd->count_cuted_fields; + DBUG_ENTER("read_statistics_for_table"); /* Don't write warnings for internal field conversions */ diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h index b4c2cb61cab..6754fb04469 100644 --- a/storage/innobase/include/btr0btr.h +++ b/storage/innobase/include/btr0btr.h @@ -242,7 +242,6 @@ btr_block_get_func( dict_index_t* index, mtr_t* mtr); -# ifdef UNIV_DEBUG /** Gets a buffer page and declares its latching order level. @param page_id tablespace/page identifier @param page_size page size @@ -250,37 +249,9 @@ btr_block_get_func( @param index index tree, may be NULL if not the insert buffer tree @param mtr mini-transaction handle @return the block descriptor */ -# define btr_block_get(page_id, page_size, mode, index, mtr) \ +# define btr_block_get(page_id, page_size, mode, index, mtr) \ btr_block_get_func(page_id, page_size, mode, \ __FILE__, __LINE__, (dict_index_t*)index, mtr) -# else /* UNIV_DEBUG */ -/** Gets a buffer page and declares its latching order level. -@param page_id tablespace/page identifier -@param page_size page size -@param mode latch mode -@param index index tree, may be NULL if not the insert buffer tree -@param mtr mini-transaction handle -@return the block descriptor */ -# define btr_block_get(page_id, page_size, mode, index, mtr) \ - btr_block_get_func(page_id, page_size, mode, __FILE__, __LINE__, (dict_index_t*)index, mtr) -# endif /* UNIV_DEBUG */ -/** Gets a buffer page and declares its latching order level. -@param page_id tablespace/page identifier -@param page_size page size -@param mode latch mode -@param index index tree, may be NULL if not the insert buffer tree -@param mtr mini-transaction handle -@return the uncompressed page frame */ -UNIV_INLINE -page_t* -btr_page_get( -/*=========*/ - const page_id_t page_id, - const page_size_t& page_size, - ulint mode, - dict_index_t* index, - mtr_t* mtr) - MY_ATTRIBUTE((warn_unused_result)); /**************************************************************//** Gets the index id field of a page. @return index id */ diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic index 69ceaceac9a..b06816f653d 100644 --- a/storage/innobase/include/btr0btr.ic +++ b/storage/innobase/include/btr0btr.ic @@ -95,36 +95,6 @@ btr_page_set_index_id( } } -/** Gets a buffer page and declares its latching order level. -@param space tablespace identifier -@param zip_size compressed page size in bytes or 0 for uncompressed pages -@param page_no page number -@param mode latch mode -@param idx index tree, may be NULL if not the insert buffer tree -@param mtr mini-transaction handle -@return the uncompressed page frame */ -UNIV_INLINE -page_t* -btr_page_get( -/*=========*/ - const page_id_t page_id, - const page_size_t& page_size, - ulint mode, - dict_index_t* index, - mtr_t* mtr) -{ - buf_block_t* block=NULL; - buf_frame_t* frame=NULL; - - block = btr_block_get(page_id, page_size, mode, index, mtr); - - if (block) { - frame = buf_block_get_frame(block); - } - - return ((page_t*)frame); -} - /**************************************************************//** Gets the index id field of a page. @return index id */ |