- commits - lists.mariadb.org

[Commits] 283b327: Changes for MDEV-12387
by galina.shalygina＠mariadb.com 16 Apr '18

16 Apr '18

revision-id: 283b3275742ca22cd1f46a21b1a794f1b52039a9 (mariadb-10.3.4-59-g283b327) parent(s): 608d6773bff86b82d9fa35e77065cb0b6ed9e547 author: Galina Shalygina committer: Galina Shalygina timestamp: 2018-04-17 01:06:57 +0200 message: Changes for MDEV-12387 Procedures renamed, some missing definitions added. *Item_direct_view_ref::in_subq_field_transformer_for_having added --- sql/item.cc | 7 ++-- sql/item.h | 13 ++++--- sql/item_cmpfunc.h | 4 +- sql/opt_subselect.cc | 105 ++++++++++++++++++++++++++++++++++++--------------- sql/sql_derived.cc | 8 ++-- sql/sql_select.cc | 1 + 6 files changed, 92 insertions(+), 46 deletions(-) diff --git a/sql/item.cc b/sql/item.cc index b1134d1..7a6879e 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7904,8 +7904,7 @@ Grouping_tmp_field *find_matching_grouping_field(Item *item, } -Item *Item_field::derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg) +Item *Item_field::grouping_field_transformer_for_where(THD *thd, uchar *arg) { st_select_lex *sel= (st_select_lex *)arg; Grouping_tmp_field *gr_field= find_matching_grouping_field(this, sel); @@ -7916,8 +7915,8 @@ Item *Item_field::derived_grouping_field_transformer_for_where(THD *thd, Item * -Item_direct_view_ref::derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg) +Item_direct_view_ref::grouping_field_transformer_for_where(THD *thd, + uchar *arg) { if (!item_equal) return this; diff --git a/sql/item.h b/sql/item.h index 2d8972f..faeb4ae 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1785,8 +1785,7 @@ class Item: public Value_source, { return this; } virtual Item *derived_field_transformer_for_where(THD *thd, uchar *arg) { return this; } - virtual Item *derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg) + virtual Item *grouping_field_transformer_for_where(THD *thd, uchar *arg) { return this; } virtual Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg) { return this; } @@ -2959,7 +2958,7 @@ class Item_field :public Item_ident virtual Item *update_value_transformer(THD *thd, uchar *select_arg); Item *derived_field_transformer_for_having(THD *thd, uchar *arg); Item *derived_field_transformer_for_where(THD *thd, uchar *arg); - Item *derived_grouping_field_transformer_for_where(THD *thd, uchar *arg); + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg); Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg); virtual void print(String *str, enum_query_type query_type); bool excl_dep_on_table(table_map tab_map); @@ -5091,8 +5090,8 @@ class Item_direct_view_ref :public Item_direct_ref bool excl_dep_on_in_subq_left_part(Item_in_subselect *subq_pred); Item *derived_field_transformer_for_having(THD *thd, uchar *arg); Item *derived_field_transformer_for_where(THD *thd, uchar *arg); - Item *derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg); + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg); + Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg); void save_val(Field *to) { @@ -5998,7 +5997,9 @@ class Item_cache: public Item_basic_constant, { return convert_to_basic_const_item(thd); } Item *derived_field_transformer_for_where(THD *thd, uchar *arg) { return convert_to_basic_const_item(thd); } - Item *derived_grouping_field_transformer_for_where(THD *thd, uchar *arg) + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg) + { return convert_to_basic_const_item(thd); } + Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg) { return convert_to_basic_const_item(thd); } }; diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index c2d7a4c..f565f3a 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1260,7 +1260,9 @@ class Item_func_nullif :public Item_func_case_expression { reset_first_arg_if_needed(); return this; } Item *derived_field_transformer_for_where(THD *thd, uchar *arg) { reset_first_arg_if_needed(); return this; } - Item *derived_grouping_field_transformer_for_where(THD *thd, uchar *arg) + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg) + { reset_first_arg_if_needed(); return this; } + Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg) { reset_first_arg_if_needed(); return this; } }; diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 8f6483e..eac779c 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -5898,7 +5898,6 @@ bool setup_jtbm_semi_joins(JOIN *join, List<TABLE_LIST> *join_list, List_iterator<TABLE_LIST> li(*join_list); THD *thd= join->thd; DBUG_ENTER("setup_jtbm_semi_joins"); - eq_list.empty(); while ((table= li++)) { @@ -6432,14 +6431,39 @@ bool Item_equal::excl_dep_on_in_subq_left_part(Item_in_subselect *subq_pred) } -Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) +/** + @brief + Transforms item so it can be pushed into the IN subquery HAVING clause + + @param thd the thread handle + @param in_item the item for which pushable item should be created + @param subq_pred the IN subquery predicate + + @details + This method traverses the fields of the select of the IN subquery predicate + subq_pred trying to find the corresponding item 'new_item' for in_item. + If in_item has equal items it traverses the fields of the select of + subq_pred for each equal item trying to find corresponding item 'new_item'. + If 'new_item' is found, a shell for this item is created. This shell can be + pushed into the HAVING part of subq_pred select. + + @retval <item*> reference to the created corresonding item shell for in_item + @retval NULL if mistake occurs +*/ + +static +Item *get_corresponding_item_for_in_subq_having(THD *thd, Item *in_item, + Item_in_subselect *subq_pred) { - Item_in_subselect *subq_pred= (Item_in_subselect *)arg; + DBUG_ASSERT(in_item->type() == Item::FIELD_ITEM || + (in_item->type() == Item::REF_ITEM && + ((Item_ref *) in_item)->ref_type() == Item_ref::VIEW_REF)); - List_iterator<In_subq_field> li(subq_pred->comparable_fields); In_subq_field *fi; - Item_field *field_item= (Item_field *) (real_item()); Item *new_item; + List_iterator<In_subq_field> li(subq_pred->comparable_fields); + Item_field *field_item= (Item_field *) (in_item->real_item()); + Item_equal *item_equal= in_item->get_item_equal(); if (item_equal) { @@ -6452,10 +6476,11 @@ Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) while ((fi= li++)) { if (field_item->field == - ((Item_field *) (fi->left_it->real_item()))->field) - { - new_item= fi->right_it; - } + ((Item_field *) (fi->left_it->real_item()))->field) + { + new_item= fi->right_it; + break; + } } } } @@ -6465,39 +6490,56 @@ Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) while ((fi= li++)) { if (field_item->field == - ((Item_field *) (fi->left_it->real_item()))->field) + ((Item_field *) (fi->left_it->real_item()))->field) + { new_item= fi->right_it; + break; + } } } - if (!new_item) - return this; - - Item_ref *ref= - new (thd->mem_root) Item_ref(thd, - &subq_pred->unit->first_select()->context, - NullS, NullS, - &new_item->name); + if (new_item) + { + Item_ref *ref= + new (thd->mem_root) Item_ref(thd, + &subq_pred->unit->first_select()->context, + NullS, NullS, + &new_item->name); return ref; - + } DBUG_ASSERT(0); return NULL; } +Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) +{ + return get_corresponding_item_for_in_subq_having(thd, this, + (Item_in_subselect *)arg); +} + + +Item *Item_direct_view_ref::in_subq_field_transformer_for_having(THD *thd, + uchar *arg) +{ + return get_corresponding_item_for_in_subq_having(thd, this, + (Item_in_subselect *)arg); +} + + /** @brief Find fields that are used in the GROUP BY of the select @param thd the thread handle - @param sel select of the right part of IN subquery - @param fields fields list of the left part of IN subquery + @param sel the select of the IN subquery predicate select + @param fields fields of the left part of the IN subquery predicate @details - This method looks through the fields which are used in the GROUP BY of - sel and saves this fields with their prototypes from the fields list - of the left part of IN subquery + This method traverses fields which are used in the GROUP BY of + sel and saves them with their corresponding items from fields. */ + void grouping_fields_in_the_in_subq_left_part(THD *thd, st_select_lex *sel, List<In_subq_field> *fields, @@ -6568,6 +6610,7 @@ void grouping_fields_in_the_in_subq_left_part(THD *thd, @retval TRUE if an error occurs @retval FALSE otherwise */ + bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) { DBUG_ENTER("Item_in_subselect::pushdown_cond_for_in_subquery"); @@ -6640,12 +6683,12 @@ bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) if (cond_over_partition_fields) cond_over_partition_fields= cond_over_partition_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, (uchar*) sel); + &Item::grouping_field_transformer_for_where, (uchar*) sel); if (cond_over_partition_fields) { cond_over_partition_fields->walk( - &Item::cleanup_excluding_const_fields_processor, 0, 0); + &Item::cleanup_excluding_const_fields_processor, 0, 0); sel->cond_pushed_into_where= cond_over_partition_fields; } goto exit; @@ -6667,9 +6710,10 @@ bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) into the sel of the WHERE clause. */ if (cond_over_grouping_fields) - cond_over_grouping_fields= cond_over_grouping_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, - (uchar*) sel); + cond_over_grouping_fields= + cond_over_grouping_fields->transform(thd, + &Item::grouping_field_transformer_for_where, + (uchar*) sel); if (cond_over_grouping_fields) { @@ -6695,8 +6739,7 @@ bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) if (!extracted_cond) goto exit; - extracted_cond->walk(&Item::cleanup_excluding_const_fields_processor, - 0, 0); + extracted_cond->walk(&Item::cleanup_excluding_const_fields_processor, 0, 0); sel->cond_pushed_into_having= extracted_cond; exit: diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index f2179ae..1c62a38 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -1310,8 +1310,8 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived) sl->build_cond_for_grouping_fields(thd, extracted_cond_copy, true); if (cond_over_partition_fields) cond_over_partition_fields= cond_over_partition_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, - (uchar*) sl); + &Item::grouping_field_transformer_for_where, + (uchar*) sl); if (cond_over_partition_fields) { cond_over_partition_fields->walk( @@ -1364,8 +1364,8 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived) */ if (cond_over_grouping_fields) cond_over_grouping_fields= cond_over_grouping_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, - (uchar*) sl); + &Item::grouping_field_transformer_for_where, + (uchar*) sl); if (cond_over_grouping_fields) { diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5a342c8..e7bc68e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1750,6 +1750,7 @@ JOIN::optimize_inner() conds->fix_fields(thd, &conds))) DBUG_RETURN(TRUE); } + eq_list.empty(); if (select_lex->cond_pushed_into_where) {

1 0

[Commits] 1a8c82161aa: MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)->thread)' failed in _ma_state_info_write
by Oleksandr Byelkin 16 Apr '18

16 Apr '18

revision-id: 1a8c82161aa2924c2bf368d376b967212f0d824f (mariadb-10.3.5-144-g1a8c82161aa) parent(s): 65eefcdc601ef0f57b0779f1722161fc83a571c3 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-04-17 00:13:07 +0200 message: MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)->thread)' failed in _ma_state_info_write Length of numegic function results limited by matsimum really possible length. (Problem was that negation did not limited it and then was not possible to create so long field) --- mysql-test/main/cast.result | 2 +- mysql-test/main/ctype_binary.result | 12 +- mysql-test/main/ctype_cp1251.result | 12 +- mysql-test/main/ctype_latin1.result | 12 +- mysql-test/main/ctype_ucs.result | 12 +- mysql-test/main/ctype_utf8.result | 12 +- mysql-test/main/metadata.result | 12 +- mysql-test/main/union.result | 502 +++++++++++++++++++++ mysql-test/main/union.test | 260 +++++++++++ .../suite/rpl/r/rpl_row_create_select.result | 4 +- sql/item.h | 5 + sql/item_func.cc | 13 + sql/item_func.h | 10 +- 13 files changed, 828 insertions(+), 40 deletions(-) diff --git a/mysql-test/main/cast.result b/mysql-test/main/cast.result index ca314573581..72e5608ca40 100644 --- a/mysql-test/main/cast.result +++ b/mysql-test/main/cast.result @@ -761,7 +761,7 @@ Warning 1292 Truncated incorrect INTEGER value: '9999999999999999999999999999999 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `CONCAT(CAST(REPEAT('9', 1000) AS SIGNED))` varchar(21) NOT NULL, + `CONCAT(CAST(REPEAT('9', 1000) AS SIGNED))` varchar(20) NOT NULL, `CONCAT(CAST(REPEAT('9', 1000) AS UNSIGNED))` varchar(20) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/main/ctype_binary.result b/mysql-test/main/ctype_binary.result index 0afe5298411..a2a24873399 100644 --- a/mysql-test/main/ctype_binary.result +++ b/mysql-test/main/ctype_binary.result @@ -132,7 +132,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -142,7 +142,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -162,7 +162,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -172,7 +172,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -182,7 +182,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -192,7 +192,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result index 2da53740619..f86facdf01b 100644 --- a/mysql-test/main/ctype_cp1251.result +++ b/mysql-test/main/ctype_cp1251.result @@ -541,7 +541,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -551,7 +551,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -571,7 +571,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -581,7 +581,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -591,7 +591,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -601,7 +601,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result index d5906cb74dd..97761e6ceec 100644 --- a/mysql-test/main/ctype_latin1.result +++ b/mysql-test/main/ctype_latin1.result @@ -838,7 +838,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -848,7 +848,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -868,7 +868,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -878,7 +878,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -888,7 +888,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -898,7 +898,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index fcc8f27010c..98038ba175d 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -1717,7 +1717,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -1727,7 +1727,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -1747,7 +1747,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -1757,7 +1757,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -1767,7 +1767,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -1777,7 +1777,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index 10d0efeff3c..8f31e7b04be 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -2589,7 +2589,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -2599,7 +2599,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -2619,7 +2619,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -2629,7 +2629,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -2639,7 +2639,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -2649,7 +2649,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/metadata.result b/mysql-test/main/metadata.result index 7848390b62e..df71496f823 100644 --- a/mysql-test/main/metadata.result +++ b/mysql-test/main/metadata.result @@ -512,12 +512,12 @@ BIT_LENGTH(10) 16 SELECT 1|2, 1&2, 1<<2, 1>>2, ~0, 1^2; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def 1|2 8 21 1 N 32929 0 63 -def 1&2 8 21 1 N 32929 0 63 -def 1<<2 8 21 1 N 32929 0 63 -def 1>>2 8 21 1 N 32929 0 63 -def ~0 8 21 20 N 32929 0 63 -def 1^2 8 21 1 N 32929 0 63 +def 1|2 8 20 1 N 32929 0 63 +def 1&2 8 20 1 N 32929 0 63 +def 1<<2 8 20 1 N 32929 0 63 +def 1>>2 8 20 1 N 32929 0 63 +def ~0 8 20 20 N 32929 0 63 +def 1^2 8 20 1 N 32929 0 63 1|2 1&2 1<<2 1>>2 ~0 1^2 3 0 4 0 18446744073709551615 3 SELECT LAST_INSERT_ID(); diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result index 4e5f9312e03..62674f3b217 100644 --- a/mysql-test/main/union.result +++ b/mysql-test/main/union.result @@ -2500,5 +2500,507 @@ t2 CREATE TABLE `t2` ( DROP TABLE t2; DROP TABLE t1; # +# MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 +# && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)-> +# thread)' failed in _ma_state_info_write +# +CREATE TABLE t1 (c1 CHAR(1)); +CREATE TABLE t2 (c2 CHAR, d2 decimal(30,10), i2 bigint); +SET @a= CAST('10' AS CHAR); +CREATE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT - @a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(53) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +CREATE OR REPLACE TABLE t3 AS SELECT d2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `d2` double DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +CREATE OR REPLACE TABLE t3 AS SELECT i2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `i2` double DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT - @a FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def - @a 5 53 0 Y 32896 31 63 +- @a +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT abs(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT abs(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def abs(@a) 5 23 0 Y 32896 31 63 +abs(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a+1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a+1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a+1 5 23 0 Y 32896 31 63 +@a+1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a-1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a-1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a-1 5 23 0 Y 32896 31 63 +@a-1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a*1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a*1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a*1 5 23 0 Y 32896 31 63 +@a*1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a/1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a/1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a/1 5 23 0 Y 32896 31 63 +@a/1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT 1/@a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT 1/@a FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def 1/@a 5 23 0 Y 32896 31 63 +1/@a +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT mod(@a,25) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT mod(@a,25) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def mod(@a,25) 5 23 0 Y 32896 31 63 +mod(@a,25) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as signed) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as signed) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as signed) 8 20 0 Y 32896 0 63 +cast(@a as signed) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as unsigned) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as unsigned) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as unsigned) 8 20 0 Y 32928 0 63 +cast(@a as unsigned) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as double) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(22) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as double) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as double) 5 22 0 Y 32896 31 63 +cast(@a as double) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as decimal) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as decimal) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as decimal) 246 11 0 Y 32896 0 63 +cast(@a as decimal) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a DIV 1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a DIV 1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a DIV 1 8 20 0 Y 32896 0 63 +@a DIV 1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT exp(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT exp(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def exp(@a) 5 23 0 Y 32896 31 63 +exp(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ln(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ln(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ln(@a) 5 23 0 Y 32896 31 63 +ln(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log2(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT log2(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def log2(@a) 5 23 0 Y 32896 31 63 +log2(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log10(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT log10(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def log10(@a) 5 23 0 Y 32896 31 63 +log10(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT log(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def log(@a) 5 23 0 Y 32896 31 63 +log(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sqrt(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT sqrt(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def sqrt(@a) 5 23 0 Y 32896 31 63 +sqrt(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT pow((a)a,3.5) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT pow((a)a,3.5) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def pow((a)a,3.5) 5 23 0 Y 32896 31 63 +pow((a)a,3.5) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT acos(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT acos(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def acos(@a) 5 23 0 Y 32896 31 63 +acos(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT asin(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT asin(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def asin(@a) 5 23 0 Y 32896 31 63 +asin(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT atan(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT atan(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def atan(@a) 5 23 0 Y 32896 31 63 +atan(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cos(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cos(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cos(@a) 5 23 0 Y 32896 31 63 +cos(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sin(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT sin(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def sin(@a) 5 23 0 Y 32896 31 63 +sin(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT tan(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT tan(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def tan(@a) 5 23 0 Y 32896 31 63 +tan(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cot(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cot(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cot(@a) 5 23 0 Y 32896 31 63 +cot(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ceiling(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(17) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ceiling(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ceiling(@a) 5 17 0 Y 32896 0 63 +ceiling(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT floor(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(17) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT floor(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def floor(@a) 5 17 0 Y 32896 0 63 +floor(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT round(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(19) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT round(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def round(@a,2) 5 19 0 Y 32896 2 63 +round(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT rand(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT rand(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def rand(@a) 5 23 0 Y 32896 31 63 +rand(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sign(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(2) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT sign(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def sign(@a) 3 2 0 Y 32896 0 63 +sign(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT degrees(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT degrees(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def degrees(@a) 5 23 0 Y 32896 31 63 +degrees(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT least(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT least(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def least(@a,2) 5 23 0 Y 32896 31 63 +least(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT greatest(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT greatest(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def greatest(@a,2) 5 23 0 Y 32896 31 63 +greatest(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT octet_length(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT octet_length(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def octet_length(@a) 3 10 0 Y 32896 0 63 +octet_length(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_length(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT bit_length(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def bit_length(@a) 8 11 0 Y 32896 0 63 +bit_length(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT char_length(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT char_length(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def char_length(@a) 3 10 0 Y 32896 0 63 +char_length(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT coercibility(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT coercibility(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def coercibility(@a) 3 10 0 N 32897 0 63 +coercibility(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ord(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(7) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ord(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ord(@a) 3 7 0 Y 32896 0 63 +ord(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT find_in_set(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(3) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT find_in_set(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def find_in_set(@a,2) 3 3 0 Y 32896 0 63 +find_in_set(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a|1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a|1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a|1 8 20 0 Y 32928 0 63 +@a|1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a&1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a&1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a&1 8 20 0 Y 32928 0 63 +@a&1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a^1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a^1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a^1 8 20 0 Y 32928 0 63 +@a^1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a>>1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a>>1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a>>1 8 20 0 Y 32928 0 63 +@a>>1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a<<1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a<<1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a<<1 8 20 0 Y 32928 0 63 +@a<<1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ~@a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ~@a FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ~@a 8 20 0 Y 32928 0 63 +~@a +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_count(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(2) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT bit_count(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def bit_count(@a) 3 2 0 Y 32896 0 63 +bit_count(@a) +drop table t2,t1; +drop table t3; +# # End of 10.3 tests # diff --git a/mysql-test/main/union.test b/mysql-test/main/union.test index f86cae87524..532b6c02f6d 100644 --- a/mysql-test/main/union.test +++ b/mysql-test/main/union.test @@ -1746,6 +1746,266 @@ DROP TABLE t2; DROP TABLE t1; +--echo # +--echo # MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 +--echo # && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)-> +--echo # thread)' failed in _ma_state_info_write +--echo # + +CREATE TABLE t1 (c1 CHAR(1)); + +CREATE TABLE t2 (c2 CHAR, d2 decimal(30,10), i2 bigint); +SET @a= CAST('10' AS CHAR); + +CREATE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT - @a FROM t2; +show create table t3; +CREATE OR REPLACE TABLE t3 AS SELECT d2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +CREATE OR REPLACE TABLE t3 AS SELECT i2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +--enable_metadata +SELECT - @a FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT abs(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT abs(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a+1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a+1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a-1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a-1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a*1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a*1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a/1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a/1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT 1/@a FROM t2; +show create table t3; +--enable_metadata +SELECT 1/@a FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT mod(@a,25) FROM t2; +show create table t3; +--enable_metadata +SELECT mod(@a,25) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as signed) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as signed) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as unsigned) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as unsigned) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as double) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as double) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as decimal) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as decimal) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a DIV 1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a DIV 1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT exp(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT exp(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ln(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT ln(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log2(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT log2(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log10(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT log10(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT log(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sqrt(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT sqrt(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT pow((a)a,3.5) FROM t2; +show create table t3; +--enable_metadata +SELECT pow((a)a,3.5) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT acos(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT acos(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT asin(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT asin(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT atan(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT atan(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cos(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT cos(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sin(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT sin(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT tan(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT tan(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cot(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT cot(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ceiling(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT ceiling(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT floor(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT floor(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT round(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT round(@a,2) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT rand(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT rand(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sign(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT sign(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT degrees(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT degrees(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT least(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT least(@a,2) FROM t2; +--disable_metadata +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT greatest(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT greatest(@a,2) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT octet_length(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT octet_length(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_length(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT bit_length(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT char_length(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT char_length(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT coercibility(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT coercibility(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ord(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT ord(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT find_in_set(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT find_in_set(@a,2) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a|1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a|1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a&1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a&1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a^1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a^1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a>>1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a>>1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a<<1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a<<1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ~@a FROM t2; +show create table t3; +--enable_metadata +SELECT ~@a FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_count(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT bit_count(@a) FROM t2; +--disable_metadata + +drop table t2,t1; +drop table t3; + --echo # --echo # End of 10.3 tests --echo # diff --git a/mysql-test/suite/rpl/r/rpl_row_create_select.result b/mysql-test/suite/rpl/r/rpl_row_create_select.result index b064d42982f..694b0c2e342 100644 --- a/mysql-test/suite/rpl/r/rpl_row_create_select.result +++ b/mysql-test/suite/rpl/r/rpl_row_create_select.result @@ -14,7 +14,7 @@ Warning 1292 Truncated incorrect DECIMAL value: 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bigint(21) DEFAULT NULL + `a` bigint(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a; @@ -23,7 +23,7 @@ Warning 1292 Truncated incorrect DECIMAL value: 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` bigint(21) DEFAULT NULL + `a` bigint(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 #After the patch, no error is reported. connection slave; diff --git a/sql/item.h b/sql/item.h index 9574bdc63bf..81d2a198495 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2023,6 +2023,11 @@ class Item: public Value_source, { marker &= ~EXTRACTION_MASK; } + void fix_length_according_to_type_handler() + { + uint32 mlen= type_handler()->max_display_length(this); + set_if_smaller(max_length, mlen); + } }; MEM_ROOT *get_thd_memroot(THD *thd); diff --git a/sql/item_func.cc b/sql/item_func.cc index e2740272385..8b09040ccf5 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -802,6 +802,7 @@ void Item_func_plus::fix_length_and_dec(void) Item_func_plus::type_handler()->Item_func_plus_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -1328,6 +1329,7 @@ void Item_func_minus::fix_length_and_dec() Item_func_minus::type_handler()->Item_func_minus_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + fix_length_according_to_type_handler(); DBUG_VOID_RETURN; } @@ -1560,6 +1562,7 @@ void Item_func_mul::fix_length_and_dec(void) Item_func_mul::type_handler()->Item_func_mul_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -1670,6 +1673,7 @@ void Item_func_div::fix_length_and_dec(void) Item_func_div::type_handler()->Item_func_div_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -1757,6 +1761,7 @@ void Item_func_int_div::fix_length_and_dec() MY_INT64_NUM_DECIMAL_DIGITS : char_length); maybe_null=1; unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag; + fix_length_according_to_type_handler(); } @@ -1854,6 +1859,7 @@ void Item_func_mod::fix_length_and_dec() DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } DBUG_VOID_RETURN; + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } @@ -1954,6 +1960,9 @@ void Item_func_neg::fix_length_and_dec() DBUG_PRINT("info", ("name %s", func_name())); args[0]->cast_to_int_type_handler()->Item_func_neg_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); + + // limit length with some realistic figures for double + fix_length_according_to_type_handler(); DBUG_VOID_RETURN; } @@ -2026,6 +2035,7 @@ void Item_func_abs::fix_length_and_dec() DBUG_PRINT("info", ("name %s", func_name())); args[0]->cast_to_int_type_handler()->Item_func_abs_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); + fix_length_according_to_type_handler(); DBUG_VOID_RETURN; } @@ -2299,6 +2309,7 @@ void Item_func_int_val::fix_length_and_dec() args[0]->cast_to_int_type_handler()-> Item_func_int_val_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -3044,6 +3055,7 @@ void Item_func_field::fix_length_and_dec() cmp_type= item_cmp_type(cmp_type, args[i]->result_type()); if (cmp_type == STRING_RESULT) agg_arg_charsets_for_comparison(cmp_collation, args, arg_count); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } @@ -3113,6 +3125,7 @@ void Item_func_find_in_set::fix_length_and_dec() } } agg_arg_charsets_for_comparison(cmp_collation, args, 2); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } static const char separator=','; diff --git a/sql/item_func.h b/sql/item_func.h index 74e469ea9f3..ce1e7a3959c 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -734,6 +734,7 @@ class Item_num_op :public Item_func_numhybrid result_precision(); decimals= 0; set_handler(type_handler_long_or_longlong()); + fix_length_according_to_type_handler(); } void fix_length_and_dec_temporal() { @@ -911,6 +912,7 @@ class Item_func_signed :public Item_int_func void fix_length_and_dec() { args[0]->type_handler()->Item_func_signed_fix_length_and_dec(this); + fix_length_according_to_type_handler(); } virtual void print(String *str, enum_query_type query_type); uint decimal_precision() const { return args[0]->decimal_precision(); } @@ -943,6 +945,7 @@ class Item_func_unsigned :public Item_func_signed void fix_length_and_dec() { args[0]->type_handler()->Item_func_unsigned_fix_length_and_dec(this); + fix_length_according_to_type_handler(); } uint decimal_precision() const { return max_length; } virtual void print(String *str, enum_query_type query_type); @@ -974,6 +977,7 @@ class Item_decimal_typecast :public Item_func void fix_length_and_dec() { args[0]->type_handler()->Item_decimal_typecast_fix_length_and_dec(this); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } const char *func_name() const { return "decimal_typecast"; } virtual void print(String *str, enum_query_type query_type); @@ -1803,7 +1807,11 @@ class Item_func_bit: public Item_longlong_func public: Item_func_bit(THD *thd, Item *a, Item *b): Item_longlong_func(thd, a, b) {} Item_func_bit(THD *thd, Item *a): Item_longlong_func(thd, a) {} - void fix_length_and_dec() { unsigned_flag= 1; } + void fix_length_and_dec() + { + unsigned_flag= 1; + fix_length_according_to_type_handler(); + } virtual inline void print(String *str, enum_query_type query_type) {

1 0

[Commits] 959362c: Fix compilation on windows
by psergey＠askmonty.org 16 Apr '18

16 Apr '18

revision-id: 959362c0208c545af8047fa690a439c39290e138 parent(s): 40bed2d39e0409d3a1ff468f792ec00ae0c8e7df committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-16 21:09:14 +0300 message: Fix compilation on windows --- sql/mysqld.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/mysqld.h b/sql/mysqld.h index 912fe36..a2a97d0 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -209,7 +209,7 @@ extern int max_user_connections; extern volatile ulong cached_thread_count; extern ulong what_to_log,flush_time; extern ulong max_prepared_stmt_count, prepared_stmt_count; -extern ulong open_files_limit; +extern MYSQL_PLUGIN_IMPORT ulong open_files_limit; extern ulonglong binlog_cache_size, binlog_stmt_cache_size; extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size;

1 0

[Commits] [Commit] 90f6f65634a: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown
by andrei.elkin＠pp.inet.fi 16 Apr '18

16 Apr '18

Sergei, hello. Here is a patch for a different issue that the former MDEV-15796 shadowed. This time dependency between the plugin and not-plugin-anymore semisync plays at shutdown. I hope you'll find time to review. Many thanks! Andrei revision-id: 90f6f65634a3245290b473f2bb65810cb9f2f18b (mariadb-10.3.6-7-g90f6f65634a) parent(s): dbbe70e1cfe9d7635d9dba774a2c9dc61163b542 author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-04-16 20:37:10 +0300 message: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown MDEV-13073 effectively made the master semisync component depending on the plugin one through instantiation of THD by its Ack thread. The thread therefore must be closing its resources prior to plugin_shutdown(), which was not the case. Fixed with implementing the requirement. --- sql/mysqld.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2db3bbe1bac..6e1a5997e15 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2240,14 +2240,14 @@ void clean_up(bool print_message) lex_free(); /* Free some memory */ item_create_cleanup(); tdc_start_shutdown(); +#ifdef HAVE_REPLICATION + semi_sync_master_deinit(); +#endif plugin_shutdown(); udf_free(); ha_end(); if (tc_log) tc_log->close(); -#ifdef HAVE_REPLICATION - semi_sync_master_deinit(); -#endif xid_cache_free(); tdc_deinit(); mdl_destroy();

1 0

[Commits] 90f6f65634a: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown
by andrei.elkin＠pp.inet.fi 16 Apr '18

16 Apr '18

revision-id: 90f6f65634a3245290b473f2bb65810cb9f2f18b (mariadb-10.3.6-7-g90f6f65634a) parent(s): dbbe70e1cfe9d7635d9dba774a2c9dc61163b542 author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-04-16 20:37:10 +0300 message: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown MDEV-13073 effectively made the master semisync component depending on the plugin one through instantiation of THD by its Ack thread. The thread therefore must be closing its resources prior to plugin_shutdown(), which was not the case. Fixed with implementing the requirement. --- sql/mysqld.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2db3bbe1bac..6e1a5997e15 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2240,14 +2240,14 @@ void clean_up(bool print_message) lex_free(); /* Free some memory */ item_create_cleanup(); tdc_start_shutdown(); +#ifdef HAVE_REPLICATION + semi_sync_master_deinit(); +#endif plugin_shutdown(); udf_free(); ha_end(); if (tc_log) tc_log->close(); -#ifdef HAVE_REPLICATION - semi_sync_master_deinit(); -#endif xid_cache_free(); tdc_deinit(); mdl_destroy();

1 0

[Commits] e34d318: MDEV-15556 MariaDB crash with big_tables=1 and CTE
by IgorBabaev 16 Apr '18

16 Apr '18

revision-id: e34d3184fd02967616bb83904aa3c21977ce6205 (mariadb-10.2.14-51-ge34d318) parent(s): 612850782d6d8bbe44d2b153a045b9a8afc624ef author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-16 10:31:30 -0700 message: MDEV-15556 MariaDB crash with big_tables=1 and CTE This bug manifested itself when the optimizer chose an execution plan with an access of the recursive CTE in a recursive query by key and ARIA/MYISAM temporary tables were used to store recursive tables. The problem appeared due to passing an incorrect parameter to the call of instantiate_tmp_table() in the function With_element::instantiate_tmp_tables(). --- mysql-test/r/cte_recursive.result | 88 ++++++++++++++++++++++++++++++++++++++- mysql-test/t/cte_recursive.test | 66 ++++++++++++++++++++++++++++- sql/sql_cte.cc | 2 +- 3 files changed, 153 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 01443bb..e1a52be 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3081,7 +3081,7 @@ a 130 set big_tables=default; # -# MDEV-1571: Setting user variable in recursive CTE +# MDEV-15571: using recursive cte with big_tables enabled # set big_tables=1; with recursive qn as @@ -3093,3 +3093,89 @@ select a*2000 from qn where a<10000000000000000000 select * from qn; ERROR 22003: BIGINT value is out of range in '`qn`.`a` * 2000' set big_tables=default; +# +# MDEV-15556: using recursive cte with big_tables enabled +# when recursive tables are accessed by key +# +SET big_tables=1; +CREATE TABLE t1 (id int, name char(10), leftpar int, rightpar int); +INSERT INTO t1 VALUES +(1, "A", 2, 3), (2, "LA", 4, 5), (4, "LLA", 6, 7), +(6, "LLLA", NULL, NULL), (7, "RLLA", NULL, NULL), (5, "RLA", 8, 9), +(8, "LRLA", NULL, NULL), (9, "RRLA", NULL, NULL), (3, "RA", 10, 11), +(10, "LRA", 12, 13), (11, "RRA", 14, 15), (15, "RRRA", NULL, NULL), +(16, "B", 17, 18), (17, "LB", NULL, NULL), (18, "RB", NULL, NULL); +CREATE TABLE t2 SELECT * FROM t1 ORDER BY rand(); +WITH RECURSIVE tree_of_a AS +(SELECT *, cast(id AS char(200)) AS path FROM t2 WHERE name="A" + UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.leftpar +UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.rightpar) +SELECT * FROM tree_of_a +ORDER BY path; +id name leftpar rightpar path +1 A 2 3 1 +2 LA 4 5 1,2 +4 LLA 6 7 1,2,4 +6 LLLA NULL NULL 1,2,4,6 +7 RLLA NULL NULL 1,2,4,7 +5 RLA 8 9 1,2,5 +8 LRLA NULL NULL 1,2,5,8 +9 RRLA NULL NULL 1,2,5,9 +3 RA 10 11 1,3 +10 LRA 12 13 1,3,10 +11 RRA 14 15 1,3,11 +15 RRRA NULL NULL 1,3,11,15 +EXPLAIN WITH RECURSIVE tree_of_a AS +(SELECT *, cast(id AS char(200)) AS path FROM t2 WHERE name="A" + UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.leftpar +UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.rightpar) +SELECT * FROM tree_of_a +ORDER BY path; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 15 Using filesort +2 DERIVED t2 ALL NULL NULL NULL NULL 15 Using where +3 RECURSIVE UNION t2 ALL NULL NULL NULL NULL 15 Using where +3 RECURSIVE UNION <derived2> ref key0 key0 5 test.t2.id 2 +4 RECURSIVE UNION t2 ALL NULL NULL NULL NULL 15 Using where +4 RECURSIVE UNION <derived2> ref key0 key0 5 test.t2.id 2 +NULL UNION RESULT <union2,3,4> ALL NULL NULL NULL NULL NULL +DROP TABLE t1,t2; +SET big_tables=0; +# +# MDEV-15840: recursive tables are accessed by key +# (the same problem as for MDEV-15556) +# +CREATE TABLE t1 (p1 text,k2 int, p2 text, k1 int); +INSERT INTO t1 select seq, seq, seq, seq from seq_1_to_1000; +CREATE PROCEDURE getNums() +BEGIN +WITH RECURSIVE cte as +( +SELECT * FROM t1 +UNION +SELECT c.* FROM t1 c JOIN cte p ON c.p1 = p.p2 AND c.k2 = p.k1 +) +SELECT * FROM cte LIMIT 10; +END | +call getNums(); +p1 k2 p2 k1 +1 1 1 1 +2 2 2 2 +3 3 3 3 +4 4 4 4 +5 5 5 5 +6 6 6 6 +7 7 7 7 +8 8 8 8 +9 9 9 9 +10 10 10 10 +DROP PROCEDURE getNums; +DROP TABLE t1; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index 008c8ea..e3032fc 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2111,7 +2111,7 @@ select * from qn; set big_tables=default; --echo # ---echo # MDEV-1571: Setting user variable in recursive CTE +--echo # MDEV-15571: using recursive cte with big_tables enabled --echo # set big_tables=1; @@ -2126,3 +2126,67 @@ with recursive qn as select * from qn; set big_tables=default; + +--echo # +--echo # MDEV-15556: using recursive cte with big_tables enabled +--echo # when recursive tables are accessed by key +--echo # + +SET big_tables=1; + +CREATE TABLE t1 (id int, name char(10), leftpar int, rightpar int); +INSERT INTO t1 VALUES + (1, "A", 2, 3), (2, "LA", 4, 5), (4, "LLA", 6, 7), + (6, "LLLA", NULL, NULL), (7, "RLLA", NULL, NULL), (5, "RLA", 8, 9), + (8, "LRLA", NULL, NULL), (9, "RRLA", NULL, NULL), (3, "RA", 10, 11), + (10, "LRA", 12, 13), (11, "RRA", 14, 15), (15, "RRRA", NULL, NULL), + (16, "B", 17, 18), (17, "LB", NULL, NULL), (18, "RB", NULL, NULL); + +CREATE TABLE t2 SELECT * FROM t1 ORDER BY rand(); + +let $q= +WITH RECURSIVE tree_of_a AS + (SELECT *, cast(id AS char(200)) AS path FROM t2 WHERE name="A" + UNION ALL + SELECT t2.*, concat(tree_of_a.path,",",t2.id) + FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.leftpar + UNION ALL + SELECT t2.*, concat(tree_of_a.path,",",t2.id) + FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.rightpar) +SELECT * FROM tree_of_a +ORDER BY path; + +eval $q; +eval EXPLAIN $q; + +DROP TABLE t1,t2; + +SET big_tables=0; + +--echo # +--echo # MDEV-15840: recursive tables are accessed by key +--echo # (the same problem as for MDEV-15556) +--echo # + +--source include/have_sequence.inc + +CREATE TABLE t1 (p1 text,k2 int, p2 text, k1 int); +INSERT INTO t1 select seq, seq, seq, seq from seq_1_to_1000; + +DELIMITER |; +CREATE PROCEDURE getNums() +BEGIN +WITH RECURSIVE cte as +( + SELECT * FROM t1 + UNION + SELECT c.* FROM t1 c JOIN cte p ON c.p1 = p.p2 AND c.k2 = p.k1 +) +SELECT * FROM cte LIMIT 10; +END | + +DELIMITER ;| +call getNums(); + +DROP PROCEDURE getNums; +DROP TABLE t1; diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc index dd46295..6bc833b 100644 --- a/sql/sql_cte.cc +++ b/sql/sql_cte.cc @@ -1401,7 +1401,7 @@ bool With_element::instantiate_tmp_tables() { if (!rec_table->is_created() && instantiate_tmp_table(rec_table, - rec_result->tmp_table_param.keyinfo, + rec_table->s->key_info, rec_result->tmp_table_param.start_recinfo, &rec_result->tmp_table_param.recinfo, 0))

1 0

[Commits] 6128507: MDEV-15571 Wrong results with big_tables=1 and CTE
by IgorBabaev 16 Apr '18

16 Apr '18

revision-id: 612850782d6d8bbe44d2b153a045b9a8afc624ef (mariadb-10.2.14-50-g6128507) parent(s): 224f7af911487f25cc2f768b66a1cce1b3833fd0 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-16 08:55:15 -0700 message: MDEV-15571 Wrong results with big_tables=1 and CTE The cause of this bug was the same as for the bug mdev-15575. Fixed by the patch for the latter. --- mysql-test/r/cte_recursive.result | 13 +++++++++++++ mysql-test/t/cte_recursive.test | 17 +++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 55cd30f..01443bb 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3080,3 +3080,16 @@ a 129 130 set big_tables=default; +# +# MDEV-1571: Setting user variable in recursive CTE +# +set big_tables=1; +with recursive qn as +( +select 1 as a from dual +union all +select a*2000 from qn where a<10000000000000000000 +) +select * from qn; +ERROR 22003: BIGINT value is out of range in '`qn`.`a` * 2000' +set big_tables=default; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index 373d6ca..008c8ea 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2109,3 +2109,20 @@ with recursive qn as select * from qn; set big_tables=default; + +--echo # +--echo # MDEV-1571: Setting user variable in recursive CTE +--echo # + +set big_tables=1; + +--error ER_DATA_OUT_OF_RANGE +with recursive qn as +( + select 1 as a from dual + union all + select a*2000 from qn where a<10000000000000000000 +) +select * from qn; + +set big_tables=default;

1 0

[Commits] 46bd3c3: MDEV-15575 different results when using CTE and big_tables=1.
by IgorBabaev 16 Apr '18

16 Apr '18

revision-id: 46bd3c3c4d696e8bbadc71d5b75e1cd022da3afc (mariadb-10.2.14-35-g46bd3c3) parent(s): 740fc2ae084f8f81990de557d696aefbc507752d author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-16 07:19:19 -0700 message: MDEV-15575 different results when using CTE and big_tables=1. This bug happened due to a defect of the implementation of the handler function ha_delete_all_rows() for the ARIA engine. The function maria_delete_all_rows() truncated the table, but it didn't touch the write cache, so the cache's write offset was not reset. In the scenario like in the function st_select_lex_unit::exec_recursive when first all records were deleted from the table and then several new records were added some metadata became inconsistent with the state of the cache. As a result the table scan function could not read records at the end of the table. The same defect could be found in the implementation of ha_delete_all_rows() for the MYISAM engine mi_delete_all_rows(). Additionally made late instantiation for the temporary table used to store rows that were used for each new iteration when executing a recursive CTE. --- mysql-test/r/cte_recursive.result | 17 +++++++++++++++++ mysql-test/t/cte_recursive.test | 12 ++++++++++++ sql/sql_union.cc | 31 ++++++++++++++++++------------- storage/maria/ma_delete_all.c | 3 +++ storage/myisam/mi_delete_all.c | 4 ++++ 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 4e9b4ae..55cd30f 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3063,3 +3063,20 @@ SELECT * FROM cte; 5 2 3 +# +# MDEV-15575: using recursive cte with big_tables enabled +# +set big_tables=1; +with recursive qn as +(select 123 as a union all select 1+a from qn where a<130) +select * from qn; +a +123 +124 +125 +126 +127 +128 +129 +130 +set big_tables=default; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index c3a5ed5..373d6ca 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2097,3 +2097,15 @@ WITH RECURSIVE cte AS UNION SELECT @c:=@c+1 FROM cte WHERE @c<3) SELECT * FROM cte; + +--echo # +--echo # MDEV-15575: using recursive cte with big_tables enabled +--echo # + +set big_tables=1; + +with recursive qn as +(select 123 as a union all select 1+a from qn where a<130) +select * from qn; + +set big_tables=default; diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 19c9330..3fe8a24 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -214,19 +214,13 @@ select_union_recursive::create_result_table(THD *thd_arg, if (! (incr_table= create_tmp_table(thd_arg, &tmp_table_param, *column_types, (ORDER*) 0, false, 1, options, HA_POS_ERROR, "", - !create_table, keep_row_order))) + true, keep_row_order))) return true; incr_table->keys_in_use_for_query.clear_all(); for (uint i=0; i < table->s->fields; i++) incr_table->field[i]->flags &= ~PART_KEY_FLAG; - if (create_table) - { - incr_table->file->extra(HA_EXTRA_WRITE_CACHE); - incr_table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); - } - TABLE *rec_table= 0; if (! (rec_table= create_tmp_table(thd_arg, &tmp_table_param, *column_types, (ORDER*) 0, false, 1, @@ -270,8 +264,11 @@ void select_union_recursive::cleanup() if (incr_table) { - incr_table->file->extra(HA_EXTRA_RESET_STATE); - incr_table->file->ha_delete_all_rows(); + if (incr_table->is_created()) + { + incr_table->file->extra(HA_EXTRA_RESET_STATE); + incr_table->file->ha_delete_all_rows(); + } free_tmp_table(thd, incr_table); } @@ -1228,16 +1225,24 @@ bool st_select_lex_unit::exec_recursive() if (!was_executed) save_union_explain(thd->lex->explain); - if ((saved_error= incr_table->file->ha_delete_all_rows())) - goto err; - if (with_element->level == 0) { + if (!incr_table->is_created() && + instantiate_tmp_table(incr_table, + tmp_table_param->keyinfo, + tmp_table_param->start_recinfo, + &tmp_table_param->recinfo, + 0)) + DBUG_RETURN(1); + incr_table->file->extra(HA_EXTRA_WRITE_CACHE); + incr_table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); start= first_select(); if (with_element->with_anchor) end= with_element->first_recursive; } - + else if ((saved_error= incr_table->file->ha_delete_all_rows())) + goto err; + for (st_select_lex *sl= start ; sl != end; sl= sl->next_select()) { thd->lex->current_select= sl; diff --git a/storage/maria/ma_delete_all.c b/storage/maria/ma_delete_all.c index a14603b..ee75218 100644 --- a/storage/maria/ma_delete_all.c +++ b/storage/maria/ma_delete_all.c @@ -135,6 +135,9 @@ int maria_delete_all_rows(MARIA_HA *info) goto err; } + if (info->opt_flag & WRITE_CACHE_USED) + reinit_io_cache(&info->rec_cache, WRITE_CACHE, 0, 1, 1); + _ma_writeinfo(info, WRITEINFO_UPDATE_KEYFILE); #ifdef HAVE_MMAP /* Map again */ diff --git a/storage/myisam/mi_delete_all.c b/storage/myisam/mi_delete_all.c index 37fdf2d..c772e84 100644 --- a/storage/myisam/mi_delete_all.c +++ b/storage/myisam/mi_delete_all.c @@ -62,6 +62,10 @@ int mi_delete_all_rows(MI_INFO *info) if (mysql_file_chsize(info->dfile, 0, 0, MYF(MY_WME)) || mysql_file_chsize(share->kfile, share->base.keystart, 0, MYF(MY_WME))) goto err; + + if (info->opt_flag & WRITE_CACHE_USED) + reinit_io_cache(&info->rec_cache, WRITE_CACHE, 0, 1, 1); + (void) _mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE); DBUG_RETURN(0);

1 0

[Commits] 3d1ad2a5e85: MDEV-13516: encryption.create_or_replace test fails in buildbot with InnoDB assertion failure
by jan 16 Apr '18

16 Apr '18

revision-id: 3d1ad2a5e85284b5ec4bb28f744b93b0b73e3934 (mariadb-10.1.32-62-g3d1ad2a5e85) parent(s): 3e12e39fb3dd0346578d50fe98215f1c6bce354c author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-16 15:06:41 +0300 message: MDEV-13516: encryption.create_or_replace test fails in buildbot with InnoDB assertion failure fil_crypt_rotate_pages If tablespace is marked as stopping stop also page rotation fil_crypt_flush_space If tablespace is marked as stopping do not try to read page 0 and write it back. --- storage/innobase/fil/fil0crypt.cc | 24 ++++++++++++++++-------- storage/xtradb/fil/fil0crypt.cc | 24 ++++++++++++++++-------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index cb499121c86..2d149f07433 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -2019,6 +2019,12 @@ fil_crypt_rotate_pages( continue; } + /* If space is marked as stopping, stop rotating + pages. */ + if (state->space->is_stopping()) { + break; + } + fil_crypt_rotate_page(key_state, state); } } @@ -2067,20 +2073,22 @@ fil_crypt_flush_space( crypt_data->type = CRYPT_SCHEME_UNENCRYPTED; } - /* update page 0 */ - mtr_t mtr; - mtr_start(&mtr); + if (!space->is_stopping()) { + /* update page 0 */ + mtr_t mtr; + mtr_start(&mtr); - const uint zip_size = fsp_flags_get_zip_size(state->space->flags); + const uint zip_size = fsp_flags_get_zip_size(state->space->flags); - buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, + buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, RW_X_LATCH, NULL, BUF_GET, __FILE__, __LINE__, &mtr); - byte* frame = buf_block_get_frame(block); + byte* frame = buf_block_get_frame(block); - crypt_data->write_page0(frame, &mtr); + crypt_data->write_page0(frame, &mtr); - mtr_commit(&mtr); + mtr_commit(&mtr); + } } /*********************************************************************** diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc index cb499121c86..2d149f07433 100644 --- a/storage/xtradb/fil/fil0crypt.cc +++ b/storage/xtradb/fil/fil0crypt.cc @@ -2019,6 +2019,12 @@ fil_crypt_rotate_pages( continue; } + /* If space is marked as stopping, stop rotating + pages. */ + if (state->space->is_stopping()) { + break; + } + fil_crypt_rotate_page(key_state, state); } } @@ -2067,20 +2073,22 @@ fil_crypt_flush_space( crypt_data->type = CRYPT_SCHEME_UNENCRYPTED; } - /* update page 0 */ - mtr_t mtr; - mtr_start(&mtr); + if (!space->is_stopping()) { + /* update page 0 */ + mtr_t mtr; + mtr_start(&mtr); - const uint zip_size = fsp_flags_get_zip_size(state->space->flags); + const uint zip_size = fsp_flags_get_zip_size(state->space->flags); - buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, + buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, RW_X_LATCH, NULL, BUF_GET, __FILE__, __LINE__, &mtr); - byte* frame = buf_block_get_frame(block); + byte* frame = buf_block_get_frame(block); - crypt_data->write_page0(frame, &mtr); + crypt_data->write_page0(frame, &mtr); - mtr_commit(&mtr); + mtr_commit(&mtr); + } } /***********************************************************************

1 0

[Commits] 5e94fe1: MDEV-15754 Server crashes in fill_record_n_invoke_before_triggers upon ...
by sachin 16 Apr '18

16 Apr '18

revision-id: 5e94fe189d6325028613b2c830082e07ff303acb (mariadb-10.3.5-156-g5e94fe1) parent(s): f0e4f94c230326a2f2e608e4119530d775c37b21 author: Sachin Setiya committer: Sachin Setiya timestamp: 2018-04-16 16:27:11 +0530 message: MDEV-15754 Server crashes in fill_record_n_invoke_before_triggers upon ... insert into table with TIMESTAMP INVISIBLE Problem:- The segfault occurs because value is null but since timestamp field is VISIBLE it expects a value , and it tries to call value->save_in_field(.. Timestamp field should not be visible this is the problem. Solution:- While we clone field for record0_field we don't honor the field _visibility , this patch changes that. --- mysql-test/main/invisible_field.result | 5 +++++ mysql-test/main/invisible_field.test | 8 ++++++++ sql/sql_trigger.cc | 1 + 3 files changed, 14 insertions(+) diff --git a/mysql-test/main/invisible_field.result b/mysql-test/main/invisible_field.result index c331f3f..5cea77f 100644 --- a/mysql-test/main/invisible_field.result +++ b/mysql-test/main/invisible_field.result @@ -551,3 +551,8 @@ select * from t1 natural join t2; b c a d 2 3 1 4 drop table t1, t2; +CREATE TABLE t1 (c CHAR(3), t TIMESTAMP invisible); +INSERT INTO t1 (c,t) VALUES ('foo','2000-01-01 00:00:00'); +CREATE TRIGGER tr BEFORE INSERT ON t1 FOR EACH ROW SET @a= 1; +INSERT INTO t1 SELECT * FROM t1; +DROP TABLE t1; diff --git a/mysql-test/main/invisible_field.test b/mysql-test/main/invisible_field.test index 884abb1..cfe89d7 100644 --- a/mysql-test/main/invisible_field.test +++ b/mysql-test/main/invisible_field.test @@ -238,3 +238,11 @@ insert t2 (a,b,d) values (1,2,4), (10, 30, 40); select * from t1 join t2 using (a); select * from t1 natural join t2; drop table t1, t2; +## Triggers MDEV-15754 +CREATE TABLE t1 (c CHAR(3), t TIMESTAMP invisible); +INSERT INTO t1 (c,t) VALUES ('foo','2000-01-01 00:00:00'); + +CREATE TRIGGER tr BEFORE INSERT ON t1 FOR EACH ROW SET @a= 1; +INSERT INTO t1 SELECT * FROM t1; +# Cleanup +DROP TABLE t1; diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 4c1e2a5..d523779 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1240,6 +1240,7 @@ bool Table_triggers_list::prepare_record_accessors(TABLE *table) return 1; f->flags= (*fld)->flags; + f->invisible= (*fld)->invisible; f->null_ptr= null_ptr; f->null_bit= null_bit; if (null_bit == 128)

1 0