database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-09-24 13:39:31 +03:00
parent e157f81771 ef701bfd07
commit 7ae290c757
4 changed files with 6 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/field.cc
View File

@ -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,