- commits - lists.mariadb.org

[Commits] 6df4e4a855f: MDEV-16217: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed in Field_num::get_date
by Oleksandr Byelkin 08 Aug '18

08 Aug '18

revision-id: 6df4e4a855fe223988c12681f8caec6c49b2f629 (mariadb-10.2.16-66-g6df4e4a855f) parent(s): 4ddcb4eb46c62cf459936554d43351db740ba14d author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-08-08 12:28:15 +0200 message: MDEV-16217: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed in Field_num::get_date - clean up DEFAULT() to work only with default value and correctly print itself. - fix of DBUG_ASSERT about fields read/write - fix of firld marking for write based really on the thd->mark_used_columns flag --- mysql-test/r/func_default.result | 2 +- mysql-test/r/func_time.result | 28 ++++++++++++++++++++++++++++ mysql-test/t/func_time.test | 21 +++++++++++++++++++++ sql/field.cc | 21 +++++++++++++++++++-- sql/field.h | 1 + sql/item.cc | 25 ++++++++++++++++++++++++- sql/item.h | 5 +++++ sql/sql_base.cc | 2 +- 8 files changed, 100 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/func_default.result b/mysql-test/r/func_default.result index 535be10da86..1f331af287c 100644 --- a/mysql-test/r/func_default.result +++ b/mysql-test/r/func_default.result @@ -8,7 +8,7 @@ explain extended select default(str), default(strnull), default(intg), default(r id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select default('') AS `default(str)`,default('') AS `default(strnull)`,default(0) AS `default(intg)`,default(0) AS `default(rel)` from dual +Note 1003 select default(`str`) AS `default(str)`,default(`strnull`) AS `default(strnull)`,default(`intg`) AS `default(intg)`,default(`rel`) AS `default(rel)` from dual select * from t1 where str <> default(str); str strnull intg rel 0 0 diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 55c2c93eb56..51f51820efc 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -3260,3 +3260,31 @@ DROP TABLE t1,t2; # # End of 10.1 tests # +# +# MDEV-16217: Assertion `!table || (!table->read_set || +# bitmap_is_set(table->read_set, field_index))' +# failed in Field_num::get_date +# +CREATE TABLE t1 (pk int default 0, a1 date); +INSERT INTO t1 VALUES (1,'1900-01-01'),(2,NULL),(3,NULL),(4,NULL); +CREATE VIEW v1 AS +SELECT t1.pk AS pk, t1.a1 AS a1 FROM t1; +SELECT a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) FROM v1; +a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) +0 +NULL +NULL +NULL +SELECT a1 BETWEEN (('2018-08-24')) AND (~ DEFAULT(pk)) FROM v1; +a1 BETWEEN (('2018-08-24')) AND (~ DEFAULT(pk)) +0 +NULL +NULL +NULL +Warnings: +Warning 1292 Incorrect datetime value: '18446744073709551615' +DROP VIEW v1; +DROP TABLE t1; +# +# End of 10.2 tests +# diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 3503b6d5bc6..c8859feee93 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -1857,3 +1857,24 @@ DROP TABLE t1,t2; --echo # --echo # End of 10.1 tests --echo # + +--echo # +--echo # MDEV-16217: Assertion `!table || (!table->read_set || +--echo # bitmap_is_set(table->read_set, field_index))' +--echo # failed in Field_num::get_date +--echo # +CREATE TABLE t1 (pk int default 0, a1 date); +INSERT INTO t1 VALUES (1,'1900-01-01'),(2,NULL),(3,NULL),(4,NULL); + +CREATE VIEW v1 AS +SELECT t1.pk AS pk, t1.a1 AS a1 FROM t1; + +SELECT a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) FROM v1; +SELECT a1 BETWEEN (('2018-08-24')) AND (~ DEFAULT(pk)) FROM v1; + +DROP VIEW v1; +DROP TABLE t1; + +--echo # +--echo # End of 10.2 tests +--echo # diff --git a/sql/field.cc b/sql/field.cc index 9ca9663f066..e12adbf47b3 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -70,8 +70,25 @@ const char field_separator=','; #define BLOB_PACK_LENGTH_TO_MAX_LENGH(arg) \ ((ulong) ((1LL << MY_MIN(arg, 4) * 8) - 1)) -#define ASSERT_COLUMN_MARKED_FOR_READ DBUG_ASSERT(!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))) -#define ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED DBUG_ASSERT(is_stat_field || !table || (!table->write_set || bitmap_is_set(table->write_set, field_index) || (table->vcol_set && bitmap_is_set(table->vcol_set, field_index)))) +// Column marked for read or the field set to read out or record[0] or [1] +#define ASSERT_COLUMN_MARKED_FOR_READ \ + DBUG_ASSERT(!table || \ + (!table->read_set || \ + bitmap_is_set(table->read_set, field_index) || \ + (!(ptr >= table->record[0] && \ + ptr < table->record[0] + table->s->reclength) && \ + !(ptr >= table->record[1] && \ + ptr < table->record[1] + table->s->reclength)))) + +#define ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED \ + DBUG_ASSERT(is_stat_field || !table || \ + (!table->write_set || \ + bitmap_is_set(table->write_set, field_index) || \ + (!(ptr >= table->record[0] && \ + ptr < table->record[0] + table->s->reclength) && \ + !(ptr >= table->record[1] && \ + ptr < table->record[1] + table->s->reclength))) || \ + (table->vcol_set && bitmap_is_set(table->vcol_set, field_index))) #define FLAGSTR(S,F) ((S) & (F) ? #F " " : "") diff --git a/sql/field.h b/sql/field.h index 22c276478b6..55c3ed4c4bd 100644 --- a/sql/field.h +++ b/sql/field.h @@ -630,6 +630,7 @@ class Virtual_column_info: public Sql_alloc bool utf8; /* Already in utf8 */ Item *expr; LEX_STRING name; /* Name of constraint */ + /* see VCOL_* (VCOL_FIELD_REF, ...) */ uint flags; Virtual_column_info() diff --git a/sql/item.cc b/sql/item.cc index 58d2b7dbfc0..91fe7ff03aa 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8917,8 +8917,19 @@ bool Item_default_value::fix_fields(THD *thd, Item **items) fixed= 1; return FALSE; } + + /* + DEFAULT() do not need table field so should not ask handler to bring + field value (mark column for read) + */ + enum_mark_columns save_mark_used_columns= thd->mark_used_columns; + thd->mark_used_columns= MARK_COLUMNS_NONE; if (!arg->fixed && arg->fix_fields(thd, &arg)) + { + thd->mark_used_columns= save_mark_used_columns; goto error; + } + thd->mark_used_columns= save_mark_used_columns; real_arg= arg->real_item(); @@ -8938,12 +8949,16 @@ bool Item_default_value::fix_fields(THD *thd, Item **items) goto error; memcpy((void *)def_field, (void *)field_arg->field, field_arg->field->size_of()); - IF_DBUG(def_field->is_stat_field=1,); // a hack to fool ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED + // If non-constant default value expression if (def_field->default_value && def_field->default_value->flags) { uchar *newptr= (uchar*) thd->alloc(1+def_field->pack_length()); if (!newptr) goto error; + /* + Even if DEFAULT() do not read tables fields, the default value + expression can do it. + */ fix_session_vcol_expr_for_read(thd, def_field, def_field->default_value); if (thd->mark_used_columns != MARK_COLUMNS_NONE) def_field->default_value->expr->walk(&Item::register_field_in_read_map, 1, 0); @@ -8970,6 +8985,14 @@ void Item_default_value::print(String *str, enum_query_type query_type) return; } str->append(STRING_WITH_LEN("default(")); + /* + We take DEFAULT from a field so do not need it value in case of const + tables but its name so we set QT_NO_DATA_EXPANSION (as we print for + table definition, also we do not need table and database name) + */ + query_type= (enum_query_type) (query_type | QT_NO_DATA_EXPANSION | + QT_ITEM_IDENT_SKIP_DB_NAMES | + QT_ITEM_IDENT_SKIP_TABLE_NAMES); arg->print(str, query_type); str->append(')'); } diff --git a/sql/item.h b/sql/item.h index 8fad8dadf22..d252a256f76 100644 --- a/sql/item.h +++ b/sql/item.h @@ -5316,6 +5316,11 @@ class Item_default_value : public Item_field return false; } table_map used_tables() const; + virtual void update_used_tables() + { + if (field && field->default_value) + field->default_value->expr->walk(&Item::register_field_in_read_map, 1, 0); + } Field *get_tmp_table_field() { return 0; } Item *get_tmp_table_item(THD *thd) { return this; } Item_field *field_for_view_update() { return 0; } diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 36bf39ea8f3..2c5bdf01468 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5688,7 +5688,7 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list, TABLE *table= field_to_set->table; if (thd->mark_used_columns == MARK_COLUMNS_READ) bitmap_set_bit(table->read_set, field_to_set->field_index); - else + else if (thd->mark_used_columns == MARK_COLUMNS_WRITE) bitmap_set_bit(table->write_set, field_to_set->field_index); } }

1 0

[Commits] 637c2d76a03: fix default() itself after talking to serg
by Oleksandr Byelkin 08 Aug '18

08 Aug '18

revision-id: 637c2d76a0332058b8771be37c17d077f297f0b1 (mariadb-10.2.16-67-g637c2d76a03) parent(s): 1e8b79d966fca2ae541477972ac759be5ee60c4e author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-08-08 12:24:37 +0200 message: fix default() itself after talking to serg --- mysql-test/r/func_default.result | 2 +- mysql-test/r/func_time.result | 2 +- mysql-test/t/func_time.test | 6 +++--- sql/field.cc | 21 +++++++++++++++++++-- sql/field.h | 1 + sql/item.cc | 25 ++++++++++++++++++++++++- sql/item.h | 14 +++++--------- sql/sql_base.cc | 2 +- 8 files changed, 55 insertions(+), 18 deletions(-) diff --git a/mysql-test/r/func_default.result b/mysql-test/r/func_default.result index 535be10da86..1f331af287c 100644 --- a/mysql-test/r/func_default.result +++ b/mysql-test/r/func_default.result @@ -8,7 +8,7 @@ explain extended select default(str), default(strnull), default(intg), default(r id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select default('') AS `default(str)`,default('') AS `default(strnull)`,default(0) AS `default(intg)`,default(0) AS `default(rel)` from dual +Note 1003 select default(`str`) AS `default(str)`,default(`strnull`) AS `default(strnull)`,default(`intg`) AS `default(intg)`,default(`rel`) AS `default(rel)` from dual select * from t1 where str <> default(str); str strnull intg rel 0 0 diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index d3e81a8f2ee..51f51820efc 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -3267,7 +3267,7 @@ DROP TABLE t1,t2; # CREATE TABLE t1 (pk int default 0, a1 date); INSERT INTO t1 VALUES (1,'1900-01-01'),(2,NULL),(3,NULL),(4,NULL); -CREATE VIEW v1 AS +CREATE VIEW v1 AS SELECT t1.pk AS pk, t1.a1 AS a1 FROM t1; SELECT a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) FROM v1; a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 98b5f968fe0..c8859feee93 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -1865,10 +1865,10 @@ DROP TABLE t1,t2; --echo # CREATE TABLE t1 (pk int default 0, a1 date); INSERT INTO t1 VALUES (1,'1900-01-01'),(2,NULL),(3,NULL),(4,NULL); - -CREATE VIEW v1 AS + +CREATE VIEW v1 AS SELECT t1.pk AS pk, t1.a1 AS a1 FROM t1; - + SELECT a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) FROM v1; SELECT a1 BETWEEN (('2018-08-24')) AND (~ DEFAULT(pk)) FROM v1; diff --git a/sql/field.cc b/sql/field.cc index 9ca9663f066..e12adbf47b3 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -70,8 +70,25 @@ const char field_separator=','; #define BLOB_PACK_LENGTH_TO_MAX_LENGH(arg) \ ((ulong) ((1LL << MY_MIN(arg, 4) * 8) - 1)) -#define ASSERT_COLUMN_MARKED_FOR_READ DBUG_ASSERT(!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))) -#define ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED DBUG_ASSERT(is_stat_field || !table || (!table->write_set || bitmap_is_set(table->write_set, field_index) || (table->vcol_set && bitmap_is_set(table->vcol_set, field_index)))) +// Column marked for read or the field set to read out or record[0] or [1] +#define ASSERT_COLUMN_MARKED_FOR_READ \ + DBUG_ASSERT(!table || \ + (!table->read_set || \ + bitmap_is_set(table->read_set, field_index) || \ + (!(ptr >= table->record[0] && \ + ptr < table->record[0] + table->s->reclength) && \ + !(ptr >= table->record[1] && \ + ptr < table->record[1] + table->s->reclength)))) + +#define ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED \ + DBUG_ASSERT(is_stat_field || !table || \ + (!table->write_set || \ + bitmap_is_set(table->write_set, field_index) || \ + (!(ptr >= table->record[0] && \ + ptr < table->record[0] + table->s->reclength) && \ + !(ptr >= table->record[1] && \ + ptr < table->record[1] + table->s->reclength))) || \ + (table->vcol_set && bitmap_is_set(table->vcol_set, field_index))) #define FLAGSTR(S,F) ((S) & (F) ? #F " " : "") diff --git a/sql/field.h b/sql/field.h index 22c276478b6..55c3ed4c4bd 100644 --- a/sql/field.h +++ b/sql/field.h @@ -630,6 +630,7 @@ class Virtual_column_info: public Sql_alloc bool utf8; /* Already in utf8 */ Item *expr; LEX_STRING name; /* Name of constraint */ + /* see VCOL_* (VCOL_FIELD_REF, ...) */ uint flags; Virtual_column_info() diff --git a/sql/item.cc b/sql/item.cc index 58d2b7dbfc0..91fe7ff03aa 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8917,8 +8917,19 @@ bool Item_default_value::fix_fields(THD *thd, Item **items) fixed= 1; return FALSE; } + + /* + DEFAULT() do not need table field so should not ask handler to bring + field value (mark column for read) + */ + enum_mark_columns save_mark_used_columns= thd->mark_used_columns; + thd->mark_used_columns= MARK_COLUMNS_NONE; if (!arg->fixed && arg->fix_fields(thd, &arg)) + { + thd->mark_used_columns= save_mark_used_columns; goto error; + } + thd->mark_used_columns= save_mark_used_columns; real_arg= arg->real_item(); @@ -8938,12 +8949,16 @@ bool Item_default_value::fix_fields(THD *thd, Item **items) goto error; memcpy((void *)def_field, (void *)field_arg->field, field_arg->field->size_of()); - IF_DBUG(def_field->is_stat_field=1,); // a hack to fool ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED + // If non-constant default value expression if (def_field->default_value && def_field->default_value->flags) { uchar *newptr= (uchar*) thd->alloc(1+def_field->pack_length()); if (!newptr) goto error; + /* + Even if DEFAULT() do not read tables fields, the default value + expression can do it. + */ fix_session_vcol_expr_for_read(thd, def_field, def_field->default_value); if (thd->mark_used_columns != MARK_COLUMNS_NONE) def_field->default_value->expr->walk(&Item::register_field_in_read_map, 1, 0); @@ -8970,6 +8985,14 @@ void Item_default_value::print(String *str, enum_query_type query_type) return; } str->append(STRING_WITH_LEN("default(")); + /* + We take DEFAULT from a field so do not need it value in case of const + tables but its name so we set QT_NO_DATA_EXPANSION (as we print for + table definition, also we do not need table and database name) + */ + query_type= (enum_query_type) (query_type | QT_NO_DATA_EXPANSION | + QT_ITEM_IDENT_SKIP_DB_NAMES | + QT_ITEM_IDENT_SKIP_TABLE_NAMES); arg->print(str, query_type); str->append(')'); } diff --git a/sql/item.h b/sql/item.h index 54cd358112d..d252a256f76 100644 --- a/sql/item.h +++ b/sql/item.h @@ -5316,6 +5316,11 @@ class Item_default_value : public Item_field return false; } table_map used_tables() const; + virtual void update_used_tables() + { + if (field && field->default_value) + field->default_value->expr->walk(&Item::register_field_in_read_map, 1, 0); + } Field *get_tmp_table_field() { return 0; } Item *get_tmp_table_item(THD *thd) { return this; } Item_field *field_for_view_update() { return 0; } @@ -5649,15 +5654,6 @@ class Item_cache: public Item_basic_constant, example->split_sum_func2(thd, ref_pointer_array, fields, &example, flags); } Item *get_example() const { return example; } - /* - Functiuons like DEFAULT() are constant but still read from tables and - update them, so we should gave that chance to them in case of caching. - */ - virtual void update_used_tables() - { - if (example) - return example->update_used_tables(); - } virtual Item *convert_to_basic_const_item(THD *thd) { return 0; }; Item *derived_field_transformer_for_having(THD *thd, uchar *arg) diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 36bf39ea8f3..2c5bdf01468 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5688,7 +5688,7 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list, TABLE *table= field_to_set->table; if (thd->mark_used_columns == MARK_COLUMNS_READ) bitmap_set_bit(table->read_set, field_to_set->field_index); - else + else if (thd->mark_used_columns == MARK_COLUMNS_WRITE) bitmap_set_bit(table->write_set, field_to_set->field_index); } }

1 0

[Commits] 44bcd544b78: MDEV-16722: Assertion `type() != NULL_ITEM' failed
by Varun 08 Aug '18

08 Aug '18

revision-id: 44bcd544b785840d09b856540080866eeb9144b4 (mariadb-10.3.6-33-g44bcd544b78) parent(s): 4b0cedf82d8d8ba582648dcb4a2620c146862a43 author: Varun Gupta committer: Varun Gupta timestamp: 2018-08-08 11:54:11 +0530 message: MDEV-16722: Assertion `type() != NULL_ITEM' failed We hit this assert during the create of a temporary table field because the current code does not handle the case when the value of the NAME_CONST function is NULL. Fixed this by allowing creation of temporary table fields even for the case when NAME_CONST returns NULL value. Introduced tmp_table_field_from_field_type_maybe_null() function in Item class so both Item_basic_value and Item_name_const can use it. --- mysql-test/main/win.result | 11 +++++++++++ mysql-test/main/win.test | 9 +++++++++ sql/item.cc | 22 ++++++---------------- sql/item.h | 23 ++++++++++++++++++++--- sql/sql_select.cc | 41 ++++++++++++++++------------------------- 5 files changed, 62 insertions(+), 44 deletions(-) diff --git a/mysql-test/main/win.result b/mysql-test/main/win.result index 3d56cd8e435..1a3467bba7a 100644 --- a/mysql-test/main/win.result +++ b/mysql-test/main/win.result @@ -3315,5 +3315,16 @@ COUNT(DISTINCT t2.a2) rank() OVER (ORDER BY t2.b1) 1 3 DROP TABLE t1,t2; # +# MDEV-16722: Assertion `type() != NULL_ITEM' failed +# +create table t1 (a int); +insert into t1 values (1),(2),(3); +SELECT row_number() OVER (order by a) FROM t1 order by NAME_CONST('myname',NULL); +row_number() OVER (order by a) +1 +2 +3 +drop table t1; +# # Start of 10.3 tests # diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test index d483cdbaa83..2efa0d562c8 100644 --- a/mysql-test/main/win.test +++ b/mysql-test/main/win.test @@ -2083,6 +2083,15 @@ SELECT COUNT(DISTINCT t2.a2), FROM t2 ,t1 GROUP BY t2.b1 ORDER BY t1.a1; DROP TABLE t1,t2; +--echo # +--echo # MDEV-16722: Assertion `type() != NULL_ITEM' failed +--echo # + +create table t1 (a int); +insert into t1 values (1),(2),(3); +SELECT row_number() OVER (order by a) FROM t1 order by NAME_CONST('myname',NULL); +drop table t1; + --echo # --echo # Start of 10.3 tests --echo # diff --git a/sql/item.cc b/sql/item.cc index 68aed25a580..68f7f6334ab 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2164,7 +2164,6 @@ Item_name_const::Item_name_const(THD *thd, Item *name_arg, Item *val): Item_fixed_hybrid(thd), value_item(val), name_item(name_arg) { Item::maybe_null= TRUE; - valid_args= true; if (!name_item->basic_const_item()) goto err; @@ -2183,7 +2182,6 @@ Item_name_const::Item_name_const(THD *thd, Item *name_arg, Item *val): } err: - valid_args= false; my_error(ER_WRONG_ARGUMENTS, MYF(0), "NAME_CONST"); } @@ -2191,24 +2189,16 @@ Item_name_const::Item_name_const(THD *thd, Item *name_arg, Item *val): Item::Type Item_name_const::type() const { /* - As - 1. one can try to create the Item_name_const passing non-constant - arguments, although it's incorrect and - 2. the type() method can be called before the fix_fields() to get - type information for a further type cast, e.g. - if (item->type() == FIELD_ITEM) - ((Item_field *) item)->... - we return NULL_ITEM in the case to avoid wrong casting. - - valid_args guarantees value_item->basic_const_item(); if type is - FUNC_ITEM, then we have a fudged item_func_neg() on our hands - and return the underlying type. + + We are guarenteed that value_item->basic_const_item(), if not + an error is thrown that WRONG ARGUMENTS are supplied to + NAME_CONST function. + If type is FUNC_ITEM, then we have a fudged item_func_neg() + on our hands and return the underlying type. For Item_func_set_collation() e.g. NAME_CONST('name', 'value' COLLATE collation) we return its 'value' argument type. */ - if (!valid_args) - return NULL_ITEM; Item::Type value_type= value_item->type(); if (value_type == FUNC_ITEM) { diff --git a/sql/item.h b/sql/item.h index f6f4684f643..a5648cdd92d 100644 --- a/sql/item.h +++ b/sql/item.h @@ -820,6 +820,10 @@ class Item: public Value_source, return tmp_table_field_from_field_type(table); } Field *create_tmp_field_int(TABLE *table, uint convert_int_length); + Field *tmp_table_field_from_field_type_maybe_null(TABLE *table, + Tmp_field_src *src, + const Tmp_field_param *param, + bool is_explicit_null); void push_note_converted_to_negative_complement(THD *thd); void push_note_converted_to_positive_complement(THD *thd); @@ -2649,7 +2653,20 @@ class Item_basic_value :public Item, Item_basic_value(THD *thd): Item(thd) {} public: Field *create_tmp_field_ex(TABLE *table, Tmp_field_src *src, - const Tmp_field_param *param); + const Tmp_field_param *param) + { + + /* + create_tmp_field_ex() for this type of Items is called for: + - CREATE TABLE ... SELECT + - In ORDER BY: SELECT max(a) FROM t1 GROUP BY a ORDER BY 'const'; + - In CURSORS: + DECLARE c CURSOR FOR SELECT 'test'; + OPEN c; + */ + return tmp_table_field_from_field_type_maybe_null(table, src, param, + type() == Item::NULL_ITEM); + } bool eq(const Item *item, bool binary_cmp) const; const Type_all_attributes *get_type_all_attributes_from_const() const { return this; } @@ -2990,7 +3007,6 @@ class Item_name_const : public Item_fixed_hybrid { Item *value_item; Item *name_item; - bool valid_args; public: Item_name_const(THD *thd, Item *name_arg, Item *val); @@ -3023,7 +3039,8 @@ class Item_name_const : public Item_fixed_hybrid DECLARE c CURSOR FOR SELECT NAME_CONST('x','y') FROM t1; OPEN c; */ - return create_tmp_field_ex_simple(table, src, param); + return tmp_table_field_from_field_type_maybe_null(table, src, param, + type() == Item::NULL_ITEM); } int save_in_field(Field *field, bool no_conversions) { diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 25b01e49a2f..c0f3e14f82e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16591,6 +16591,22 @@ Field *Item::create_tmp_field_int(TABLE *table, uint convert_int_length) *this, table); } +Field *Item::tmp_table_field_from_field_type_maybe_null(TABLE *table, + Tmp_field_src *src, + const Tmp_field_param *param, + bool is_explicit_null) +{ + DBUG_ASSERT(!param->make_copy_field()); + DBUG_ASSERT(!is_result_field()); + Field *result; + if ((result= tmp_table_field_from_field_type(table))) + { + if (result && is_explicit_null) + result->is_created_from_null_item= true; + } + return result; +} + Field *Item_sum::create_tmp_field(bool group, TABLE *table) { @@ -16821,31 +16837,6 @@ Field *Item_func_sp::create_tmp_field_ex(TABLE *table, return result; } - -Field *Item_basic_value::create_tmp_field_ex(TABLE *table, - Tmp_field_src *src, - const Tmp_field_param *param) -{ - /* - create_tmp_field_ex() for this type of Items is called for: - - CREATE TABLE ... SELECT - - In ORDER BY: SELECT max(a) FROM t1 GROUP BY a ORDER BY 'const'; - - In CURSORS: - DECLARE c CURSOR FOR SELECT 'test'; - OPEN c; - */ - DBUG_ASSERT(!param->make_copy_field()); - DBUG_ASSERT(!is_result_field()); - Field *result; - if ((result= tmp_table_field_from_field_type(table))) - { - if (type() == Item::NULL_ITEM) // Item_null or Item_param - result->is_created_from_null_item= true; - } - return result; -} - - /** Create field for temporary table.

1 0

[Commits] MDEV-15127 AddressSanitizer: stack-buffer-overflow in base_list::push_back ..
by Sachin Setiya 07 Aug '18

07 Aug '18

commit 482d4da0a7a7f76e8ea9026978d49565f57a4192 Author: Sachin <sachin.setiya(a)mariadb.com> Date: Tue Aug 7 16:05:48 2018 +0530 MDEV-15127 AddressSanitizer: stack-buffer-overflow in base_list::push_back .. Problem:- If we try to run this query with -WITH_ASAN=ON compiled server CREATE TABLE t1 (i INT); SET debug_dbug="+d,test_completely_invisible,test_invisible_index"; CREATE TABLE t2 LIKE t1; This will generate a stack buffer overflow error. ==8922==ERROR: AddressSanitizer: stack-buffer-overflow on address #ADDR Analyze:- Error is generated on this line if (((*last)=new list_node(info, &end_of_list))) So info is our Key*, &end_of_list is global variable and last == #ADDR So last is suspicious variable. And last is the variable present in alter_info ->key_list. Now the question is how this key_list->last gets wrong/ different stack variable. In the backtrace, we can see that key_list is generated in mysql_create_table_like_table by calling mysql_preapre_alter_table_function and dummy key_list is created by mysql_create_like_table. In the end on mysql_prepare_alter_table we call alter_info->key_list.swap(new_key_list); So there is two options either key_list is empty or not empty , IF it is not empty then there is no issues last ptr is replaced by thd->mem_root (allocated ptr) So problem arises when key_list is empty. It swaps the dummy last ptr by mysql_prepare_alter_table declared ptr. which is wrong. Solution:- We wont swap variable if list does not have any element. diff --git a/mysql-test/main/invisible_field_debug.result b/mysql-test/main/invisible_field_debug.result index 4c4ebffbdfc..b3c84d18333 100644 --- a/mysql-test/main/invisible_field_debug.result +++ b/mysql-test/main/invisible_field_debug.result @@ -369,3 +369,8 @@ t1 1 invisible 1 c A NULL NULL NULL YES BTREE t1 1 invisible_2 1 invisible A NULL NULL NULL YES BTREE drop table t1; set @old_debug= @@debug_dbug; +CREATE TABLE t1 (i INT ); +SET debug_dbug="+d,test_completely_invisible,test_invisible_index"; +CREATE TABLE t2 LIKE t1; +SET debug_dbug= DEFAULT; +DROP TABLE t1, t2; diff --git a/mysql-test/main/invisible_field_debug.test b/mysql-test/main/invisible_field_debug.test index 8674620e055..c1d6899d16e 100644 --- a/mysql-test/main/invisible_field_debug.test +++ b/mysql-test/main/invisible_field_debug.test @@ -270,3 +270,9 @@ explain select * from t1 where invisible =9; show indexes in t1; drop table t1; set @old_debug= @@debug_dbug; +## MDEV 15127 +CREATE TABLE t1 (i INT ); +SET debug_dbug="+d,test_completely_invisible,test_invisible_index"; +CREATE TABLE t2 LIKE t1; +SET debug_dbug= DEFAULT; +DROP TABLE t1, t2; diff --git a/sql/sql_list.h b/sql/sql_list.h index 0219c226803..39a1c3375e0 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -278,10 +278,13 @@ class base_list :public Sql_alloc */ inline void swap(base_list &rhs) { + list_node **rhs_last=rhs.last; swap_variables(list_node *, first, rhs.first); - swap_variables(list_node **, last, rhs.last); swap_variables(uint, elements, rhs.elements); + rhs.last= last == &first ? &rhs.first : last; + last = rhs_last == &rhs.first ? &first : rhs_last; } + inline list_node* last_node() { return *last; } inline list_node* first_node() { return first;} inline void *head() { return first->info; }

1 0

[Commits] 1e8b79d966f: MDEV-16217: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed in Field_num::get_date
by Oleksandr Byelkin 07 Aug '18

07 Aug '18

revision-id: 1e8b79d966fca2ae541477972ac759be5ee60c4e (mariadb-10.2.16-66-g1e8b79d966f) parent(s): 4ddcb4eb46c62cf459936554d43351db740ba14d author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-08-07 15:28:58 +0200 message: MDEV-16217: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed in Field_num::get_date Provide possibility for constant function like DEFAULT() still mark tables as being read. --- mysql-test/r/func_time.result | 28 ++++++++++++++++++++++++++++ mysql-test/t/func_time.test | 21 +++++++++++++++++++++ sql/item.h | 9 +++++++++ 3 files changed, 58 insertions(+) diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 55c2c93eb56..d3e81a8f2ee 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -3260,3 +3260,31 @@ DROP TABLE t1,t2; # # End of 10.1 tests # +# +# MDEV-16217: Assertion `!table || (!table->read_set || +# bitmap_is_set(table->read_set, field_index))' +# failed in Field_num::get_date +# +CREATE TABLE t1 (pk int default 0, a1 date); +INSERT INTO t1 VALUES (1,'1900-01-01'),(2,NULL),(3,NULL),(4,NULL); +CREATE VIEW v1 AS +SELECT t1.pk AS pk, t1.a1 AS a1 FROM t1; +SELECT a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) FROM v1; +a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) +0 +NULL +NULL +NULL +SELECT a1 BETWEEN (('2018-08-24')) AND (~ DEFAULT(pk)) FROM v1; +a1 BETWEEN (('2018-08-24')) AND (~ DEFAULT(pk)) +0 +NULL +NULL +NULL +Warnings: +Warning 1292 Incorrect datetime value: '18446744073709551615' +DROP VIEW v1; +DROP TABLE t1; +# +# End of 10.2 tests +# diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 3503b6d5bc6..98b5f968fe0 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -1857,3 +1857,24 @@ DROP TABLE t1,t2; --echo # --echo # End of 10.1 tests --echo # + +--echo # +--echo # MDEV-16217: Assertion `!table || (!table->read_set || +--echo # bitmap_is_set(table->read_set, field_index))' +--echo # failed in Field_num::get_date +--echo # +CREATE TABLE t1 (pk int default 0, a1 date); +INSERT INTO t1 VALUES (1,'1900-01-01'),(2,NULL),(3,NULL),(4,NULL); + +CREATE VIEW v1 AS +SELECT t1.pk AS pk, t1.a1 AS a1 FROM t1; + +SELECT a1 BETWEEN (('2018-08-24')) AND (DEFAULT(pk)) FROM v1; +SELECT a1 BETWEEN (('2018-08-24')) AND (~ DEFAULT(pk)) FROM v1; + +DROP VIEW v1; +DROP TABLE t1; + +--echo # +--echo # End of 10.2 tests +--echo # diff --git a/sql/item.h b/sql/item.h index 8fad8dadf22..54cd358112d 100644 --- a/sql/item.h +++ b/sql/item.h @@ -5649,6 +5649,15 @@ class Item_cache: public Item_basic_constant, example->split_sum_func2(thd, ref_pointer_array, fields, &example, flags); } Item *get_example() const { return example; } + /* + Functiuons like DEFAULT() are constant but still read from tables and + update them, so we should gave that chance to them in case of caching. + */ + virtual void update_used_tables() + { + if (example) + return example->update_used_tables(); + } virtual Item *convert_to_basic_const_item(THD *thd) { return 0; }; Item *derived_field_transformer_for_having(THD *thd, uchar *arg)

1 0

[Commits] 517009ca0fa: MDEV-16548: Innodb fails to start on older kernels that don't support F_DUPFD_CLOEXEC
by jan 07 Aug '18

07 Aug '18

revision-id: 517009ca0fa5f0e5b48b3d244a0b5bb0c44e90a8 (mariadb-10.1.34-47-g517009ca0fa) parent(s): 3b37edee1a5121e9523fa8a7f483185f402905e2 author: Jan Lindström committer: Jan Lindström timestamp: 2018-08-07 11:35:39 +0300 message: MDEV-16548: Innodb fails to start on older kernels that don't support F_DUPFD_CLOEXEC Add runtime check that fcntl() system call really supports F_DUPFD_CLOEXEC directive. --- storage/innobase/CMakeLists.txt | 27 +++++++++++++++++++++++++++ storage/innobase/handler/ha_innodb.cc | 2 +- storage/xtradb/CMakeLists.txt | 27 +++++++++++++++++++++++++++ storage/xtradb/handler/ha_innodb.cc | 2 +- 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index 2a45f05c463..7470f2985c0 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -246,6 +246,33 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC) ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1) ENDIF() +CHECK_C_SOURCE( +" +#include <unistd.h> +#include <fcntl.h> +#include <stdlib.h> +int main() { + char filename[] = "/tmp/mytemp.XXXXXX"; + int fd = mkstemp(filename); + if (fd != -1) { + int fd2=fcntl(fd, F_DUPFD_CLOEXEC, 0); + if (fd2 != -1) { + close(fd2); + close(fd); + unlink(filename); + return (0); + } + close (fd); + unlink(filename); + } + return (1); +}" +HAVE_IB_F_DUPFD_CLOEXEC) + +IF (HAVE_IB_F_DUPFD_CLOEXEC) + ADD_DEFINITIONS(-DHAVE_IB_F_DUPFD_CLOEXEC=1) +ENDIF() + CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS) ENDIF(NOT MSVC) diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 5667efea5df..6843d90b0a9 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -2414,7 +2414,7 @@ innobase_mysql_tmpfile( } } #else -#ifdef F_DUPFD_CLOEXEC +#if defined(F_DUPFD_CLOEXEC) && defined(HAVE_IB_F_DUPFD_CLOEXEC) fd2 = fcntl(fd, F_DUPFD_CLOEXEC, 0); #else fd2 = dup(fd); diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index f5ec6fd746d..5ec5881a247 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -255,6 +255,33 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC) ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1) ENDIF() +CHECK_C_SOURCE( +" +#include <unistd.h> +#include <fcntl.h> +#include <stdlib.h> +int main() { + char filename[] = "/tmp/mytemp.XXXXXX"; + int fd = mkstemp(filename); + if (fd != -1) { + int fd2=fcntl(fd, F_DUPFD_CLOEXEC, 0); + if (fd2 != -1) { + close(fd2); + close(fd); + unlink(filename); + return (0); + } + close (fd); + unlink(filename); + } + return (1); +}" +HAVE_IB_F_DUPFD_CLOEXEC) + +IF (HAVE_IB_F_DUPFD_CLOEXEC) + ADD_DEFINITIONS(-DHAVE_IB_F_DUPFD_CLOEXEC=1) +ENDIF() + CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS) ENDIF(NOT MSVC) diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 3cd7cb6977b..fd62bc00ca4 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -2738,7 +2738,7 @@ innobase_mysql_tmpfile( } } #else -#ifdef F_DUPFD_CLOEXEC +#if defined(F_DUPFD_CLOEXEC) && defined(HAVE_IB_F_DUPFD_CLOEXEC) fd2 = fcntl(fd, F_DUPFD_CLOEXEC, 0); #else fd2 = dup(fd);

1 0

[Commits] d1c90870ed1: MDEV-15475: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed on EXPLAIN EXTENDED with constant table and view
by Oleksandr Byelkin 06 Aug '18

06 Aug '18

revision-id: d1c90870ed114da62de8b12a71e2fba62724baa9 (mariadb-5.5.61-3-gd1c90870ed1) parent(s): 68ebfb31f215247d2fa08c8ed97a320191afc179 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-08-06 15:50:22 +0200 message: MDEV-15475: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' failed on EXPLAIN EXTENDED with constant table and view Do not try to print value of the field in table if it is optimized out. EXPLAIN output still looks a bit strange (field from dual table, because table optimized out) but we do not indicate optimisations of ISNULL. --- mysql-test/r/func_isnull.result | 15 +++++++++++++++ mysql-test/t/func_isnull.test | 15 +++++++++++++++ sql/item.cc | 5 ++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/func_isnull.result b/mysql-test/r/func_isnull.result index 88c5bfd5468..fd55b7be26c 100644 --- a/mysql-test/r/func_isnull.result +++ b/mysql-test/r/func_isnull.result @@ -106,5 +106,20 @@ Note 1003 select `test`.`t2`.`d1` AS `d1`,`test`.`t1`.`d1` AS `d1` from `test`.` DROP VIEW v1; DROP TABLE t1,t2; # +# MDEV-15475: Assertion `!table || (!table->read_set || +# bitmap_is_set(table->read_set, field_index))' +# failed on EXPLAIN EXTENDED with constant table and view +# +CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=MyISAM; +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1); +EXPLAIN EXTENDED SELECT ISNULL(pk) FROM v1; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 +Warnings: +Note 1003 select isnull(`test`.`t1`.`pk`) AS `ISNULL(pk)` from dual +DROP VIEW v1; +DROP TABLE t1; +# # End of 5.5 tests # diff --git a/mysql-test/t/func_isnull.test b/mysql-test/t/func_isnull.test index 4c59fa3cbe8..2111b8f16bc 100644 --- a/mysql-test/t/func_isnull.test +++ b/mysql-test/t/func_isnull.test @@ -83,6 +83,21 @@ SELECT * FROM t2 LEFT JOIN v1 ON t2.d1=v1.d1 WHERE v1.d1 IS NULL; DROP VIEW v1; DROP TABLE t1,t2; + +--echo # +--echo # MDEV-15475: Assertion `!table || (!table->read_set || +--echo # bitmap_is_set(table->read_set, field_index))' +--echo # failed on EXPLAIN EXTENDED with constant table and view +--echo # + +CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=MyISAM; +CREATE VIEW v1 AS SELECT * FROM t1; +INSERT INTO t1 VALUES (1); +EXPLAIN EXTENDED SELECT ISNULL(pk) FROM v1; +# Cleanup +DROP VIEW v1; +DROP TABLE t1; + --echo # --echo # End of 5.5 tests --echo # diff --git a/sql/item.cc b/sql/item.cc index 33c35f8c3e0..77be702bac5 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -6845,7 +6845,10 @@ Item *Item_field::update_value_transformer(uchar *select_arg) void Item_field::print(String *str, enum_query_type query_type) { if (field && field->table->const_table && - !(query_type & QT_NO_DATA_EXPANSION)) + !(query_type & QT_NO_DATA_EXPANSION) && + // and we was gping to read field value (it is not optimised out) + field->table->read_set && + bitmap_is_set(field->table->read_set, field->field_index)) { print_value(str); return;

1 0

[Commits] 3b37edee1a5: MDEV-13333: Deadlock failure that does not occur elsewhere
by jan 06 Aug '18

06 Aug '18

revision-id: 3b37edee1a5121e9523fa8a7f483185f402905e2 (mariadb-10.1.34-46-g3b37edee1a5) parent(s): 998b1c0e75a9512bfec308da19096cbced4150ad author: Jan Lindström committer: Jan Lindström timestamp: 2018-08-06 15:45:44 +0300 message: MDEV-13333: Deadlock failure that does not occur elsewhere InnoDB executed code that is mean to execute only when Galera is used and in bad luck one of the transactions is selected incorrectly as deadlock victim. Fixed by adding wsrep_on_trx() condition before entering actual Galera transaction handling. No always repeatable test case for this issue is known. --- storage/innobase/lock/lock0lock.cc | 5 +++-- storage/xtradb/lock/lock0lock.cc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 441fcace7c3..3970a559a4c 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -4963,7 +4963,7 @@ lock_table_create( UT_LIST_ADD_LAST(trx_locks, trx->lock.trx_locks, lock); #ifdef WITH_WSREP - if (c_lock) { + if (c_lock && wsrep_on_trx(trx)) { if (wsrep_thd_is_wsrep(trx->mysql_thd) && wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { UT_LIST_INSERT_AFTER( @@ -5202,9 +5202,10 @@ lock_table_enqueue_waiting( /* Enqueue the lock request that will wait to be granted */ #ifdef WITH_WSREP - if (trx->lock.was_chosen_as_deadlock_victim) { + if (trx->lock.was_chosen_as_deadlock_victim && wsrep_on_trx(trx)) { return(DB_DEADLOCK); } + lock = lock_table_create(c_lock, table, mode | LOCK_WAIT, trx); #else lock = lock_table_create(table, mode | LOCK_WAIT, trx); diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc index 549cc411f69..2183d281b78 100644 --- a/storage/xtradb/lock/lock0lock.cc +++ b/storage/xtradb/lock/lock0lock.cc @@ -5003,7 +5003,7 @@ lock_table_create( UT_LIST_ADD_LAST(trx_locks, trx->lock.trx_locks, lock); #ifdef WITH_WSREP - if (c_lock) { + if (c_lock && wsrep_on_trx(trx)) { if (wsrep_thd_is_wsrep(trx->mysql_thd) && wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { UT_LIST_INSERT_AFTER( @@ -5244,9 +5244,10 @@ lock_table_enqueue_waiting( /* Enqueue the lock request that will wait to be granted */ #ifdef WITH_WSREP - if (trx->lock.was_chosen_as_deadlock_victim) { + if (trx->lock.was_chosen_as_deadlock_victim && wsrep_on_trx(trx)) { return(DB_DEADLOCK); } + lock = lock_table_create(c_lock, table, mode | LOCK_WAIT, trx); #else lock = lock_table_create(table, mode | LOCK_WAIT, trx);

1 0

[Commits] 422506fdd56: MDEV-13333: Deadlock failure that does not occur elsewhere
by jan 06 Aug '18

06 Aug '18

revision-id: 422506fdd5605eca6e23a35bd115ee5d40409f11 (mariadb-10.1.34-46-g422506fdd56) parent(s): 998b1c0e75a9512bfec308da19096cbced4150ad author: Jan Lindström committer: Jan Lindström timestamp: 2018-08-06 15:32:19 +0300 message: MDEV-13333: Deadlock failure that does not occur elsewhere InnoDB executed code that is mean to execute only when Galera is used and in bad luck one of the transactions is selected incorrectly as deadlock victim. Fixed by adding wsrep_on_trx() condition before entering actual Galera transaction handling. No always repeatable test case for this issue is known. --- storage/innobase/lock/lock0lock.cc | 5 +++-- storage/xtradb/lock/lock0lock.cc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 441fcace7c3..381127bf74e 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -4963,7 +4963,7 @@ lock_table_create( UT_LIST_ADD_LAST(trx_locks, trx->lock.trx_locks, lock); #ifdef WITH_WSREP - if (c_lock) { + if (c_lock && wsrep_on_trx(trx)) { if (wsrep_thd_is_wsrep(trx->mysql_thd) && wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { UT_LIST_INSERT_AFTER( @@ -5202,9 +5202,10 @@ lock_table_enqueue_waiting( /* Enqueue the lock request that will wait to be granted */ #ifdef WITH_WSREP - if (trx->lock.was_chosen_as_deadlock_victim) { + if (wsrep_on_trx(trx) && trx->lock.was_chosen_as_deadlock_victim) { return(DB_DEADLOCK); } + lock = lock_table_create(c_lock, table, mode | LOCK_WAIT, trx); #else lock = lock_table_create(table, mode | LOCK_WAIT, trx); diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc index 549cc411f69..87df0e8a75e 100644 --- a/storage/xtradb/lock/lock0lock.cc +++ b/storage/xtradb/lock/lock0lock.cc @@ -5003,7 +5003,7 @@ lock_table_create( UT_LIST_ADD_LAST(trx_locks, trx->lock.trx_locks, lock); #ifdef WITH_WSREP - if (c_lock) { + if (c_lock && wsrep_on_trx(trx)) { if (wsrep_thd_is_wsrep(trx->mysql_thd) && wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { UT_LIST_INSERT_AFTER( @@ -5244,9 +5244,10 @@ lock_table_enqueue_waiting( /* Enqueue the lock request that will wait to be granted */ #ifdef WITH_WSREP - if (trx->lock.was_chosen_as_deadlock_victim) { + if (wsrep_on_trx(trx) && trx->lock.was_chosen_as_deadlock_victim) { return(DB_DEADLOCK); } + lock = lock_table_create(c_lock, table, mode | LOCK_WAIT, trx); #else lock = lock_table_create(table, mode | LOCK_WAIT, trx);

1 0

[Commits] 4a9686a91a7: Prevent reporting an error when performing table discovery
by vicentiu＠mariadb.org 06 Aug '18

06 Aug '18

revision-id: 4a9686a91a7459a7476e36195fab0de8852e43b6 (mariadb-10.3.7-101-g4a9686a91a7) parent(s): 0c745c743c65ceb6533babdf21556b633e81566c author: Anel Husakovic committer: Vicențiu Ciorbaru timestamp: 2018-08-06 15:18:22 +0300 message: Prevent reporting an error when performing table discovery When performing table creation we check if a table exists. If storage engines that support table discovery are loaded, we also perform table discovery with those. Normally when a table is not found, my_error is called to signal this. However for this case a "table doesn't exist error" is not an actual problem so the error is caught and silenced. Avoid this entire juggling of errors by preventing a my_error call in the first place, with an additional flag when attempting to fetch the table share. --- sql/handler.cc | 78 ++++++++++++++-------------------------------------------- sql/table.cc | 12 ++++----- sql/table.h | 3 ++- 3 files changed, 26 insertions(+), 67 deletions(-) diff --git a/sql/handler.cc b/sql/handler.cc index 4f152cfd99c..a8e6b08cf42 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -5113,22 +5113,19 @@ static my_bool discover_handlerton(THD *thd, plugin_ref plugin, int ha_discover_table(THD *thd, TABLE_SHARE *share) { DBUG_ENTER("ha_discover_table"); - int found; - DBUG_ASSERT(share->error == OPEN_FRM_OPEN_ERROR); // share is not OK yet + int found = 0; - if (!engines_with_discover) - found= FALSE; - else if (share->db_plugin) - found= discover_handlerton(thd, share->db_plugin, share); - else - found= plugin_foreach(thd, discover_handlerton, - MYSQL_STORAGE_ENGINE_PLUGIN, share); - - if (!found) - open_table_error(share, OPEN_FRM_OPEN_ERROR, ENOENT); // not found + if (engines_with_discover) + { + if (share->db_plugin) + found = discover_handlerton(thd, share->db_plugin, share); + else + found = plugin_foreach(thd, discover_handlerton, + MYSQL_STORAGE_ENGINE_PLUGIN, share); + } - DBUG_RETURN(share->error != OPEN_FRM_OK); + DBUG_RETURN(found); } static my_bool file_ext_exists(char *path, size_t path_len, const char *ext) @@ -5163,43 +5160,6 @@ static my_bool discover_existence(THD *thd, plugin_ref plugin, return ht->discover_table_existence(ht, args->db, args->table_name); } -class Table_exists_error_handler : public Internal_error_handler -{ -public: - Table_exists_error_handler() - : m_handled_errors(0), m_unhandled_errors(0) - {} - - bool handle_condition(THD *thd, - uint sql_errno, - const char* sqlstate, - Sql_condition::enum_warning_level *level, - const char* msg, - Sql_condition ** cond_hdl) - { - *cond_hdl= NULL; - if (sql_errno == ER_NO_SUCH_TABLE || - sql_errno == ER_NO_SUCH_TABLE_IN_ENGINE || - sql_errno == ER_WRONG_OBJECT) - { - m_handled_errors++; - return TRUE; - } - - if (*level == Sql_condition::WARN_LEVEL_ERROR) - m_unhandled_errors++; - return FALSE; - } - - bool safely_trapped_errors() - { - return ((m_handled_errors > 0) && (m_unhandled_errors == 0)); - } - -private: - int m_handled_errors; - int m_unhandled_errors; -}; /** Check if a given table exists, without doing a full discover, if possible @@ -5298,24 +5258,24 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db, const LEX_CSTRING *table_n if (need_full_discover_for_existence) { TABLE_LIST table; - uint flags = GTS_TABLE | GTS_VIEW; + uint flags = GTS_TABLE | GTS_VIEW | GTS_NO_ERROR_IF_MISSING; if (!hton) flags|= GTS_NOLOCK; - Table_exists_error_handler no_such_table_handler; - thd->push_internal_handler(&no_such_table_handler); table.init_one_table(db, table_name, 0, TL_READ); TABLE_SHARE *share= tdc_acquire_share(thd, &table, flags); - thd->pop_internal_handler(); - if (hton && share) + // Share returned, table exists. + if (share) { - *hton= share->db_type(); + if (hton) + *hton= share->db_type(); tdc_release_share(share); + DBUG_RETURN(TRUE); } - - // the table doesn't exist if we've caught ER_NO_SUCH_TABLE and nothing else - DBUG_RETURN(!no_such_table_handler.safely_trapped_errors()); + // No share, if errors have been reported, we assume the table exists. + if (thd->is_error()) + DBUG_RETURN(TRUE); } DBUG_RETURN(FALSE); diff --git a/sql/table.cc b/sql/table.cc index 8dedb926141..3c11ea6d918 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -573,7 +573,6 @@ inline bool is_system_table_name(const char *name, size_t length) enum open_frm_error open_table_def(THD *thd, TABLE_SHARE *share, uint flags) { - bool error_given= false; File file; uchar *buf; uchar head[FRM_HEADER_SIZE]; @@ -602,8 +601,9 @@ enum open_frm_error open_table_def(THD *thd, TABLE_SHARE *share, uint flags) { if ((flags & GTS_TABLE) && (flags & GTS_USE_DISCOVERY)) { - ha_discover_table(thd, share); - error_given= true; + if (!ha_discover_table(thd, share) && !(flags & GTS_NO_ERROR_IF_MISSING)) + open_table_error(share, OPEN_FRM_OPEN_ERROR, ENOENT); + DBUG_RETURN(share->error); } goto err_not_open; } @@ -668,16 +668,14 @@ enum open_frm_error open_table_def(THD *thd, TABLE_SHARE *share, uint flags) frmlen= read_length + sizeof(head); share->init_from_binary_frm_image(thd, false, buf, frmlen); - error_given= true; // init_from_binary_frm_image has already called my_error() my_free(buf); - - goto err_not_open; + DBUG_RETURN(share->error); err: mysql_file_close(file, MYF(MY_WME)); err_not_open: - if (unlikely(share->error && !error_given)) + if (unlikely(share->error)) { share->open_errno= my_errno; open_table_error(share, share->error, share->open_errno); diff --git a/sql/table.h b/sql/table.h index 80f5e1283a3..df97b9ffbde 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2876,7 +2876,8 @@ enum get_table_share_flags { GTS_VIEW = 2, GTS_NOLOCK = 4, GTS_USE_DISCOVERY = 8, - GTS_FORCE_DISCOVERY = 16 + GTS_FORCE_DISCOVERY = 16, + GTS_NO_ERROR_IF_MISSING = 32, }; size_t max_row_length(TABLE *table, MY_BITMAP const *cols, const uchar *data);

1 0