Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7ae290c7
Commit
7ae290c7
authored
5 years ago
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.2 into 10.3
parents
e157f817
ef701bfd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
70 deletions
+6
-70
sql/field.cc
sql/field.cc
+4
-4
sql/sql_statistics.cc
sql/sql_statistics.cc
+1
-6
storage/innobase/include/btr0btr.h
storage/innobase/include/btr0btr.h
+1
-30
storage/innobase/include/btr0btr.ic
storage/innobase/include/btr0btr.ic
+0
-30
No files found.
sql/field.cc
View file @
7ae290c7
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
sql/sql_statistics.cc
View file @
7ae290c7
...
...
@@ -1155,18 +1155,12 @@ class Column_stat: public Stat_table
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 */
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/include/btr0btr.h
View file @
7ae290c7
...
...
@@ -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
...
...
@@ -253,34 +252,6 @@ btr_block_get_func(
# 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 */
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/include/btr0btr.ic
View file @
7ae290c7
...
...
@@ -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 */
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment