diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 13:39:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-24 13:39:31 +0300 |
| commit | 7ae290c75753d269fd6d10aa1b5f0c9bec1b7f2c (patch) | |
| tree | ebb6ae21e4e8f384590746988caf3c6311cc7c4b /sql/field.cc | |
| parent | e157f817713f22f26b584155faa38b121deff222 (diff) | |
| parent | ef701bfd075331843f512415541e54ba784d9b98 (diff) | |
| download | mariadb-git-7ae290c75753d269fd6d10aa1b5f0c9bec1b7f2c.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 8 |
1 files changed, 4 insertions, 4 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, |