September 2015 - developers - lists.mariadb.org

Re: [Maria-developers] [Commits] 93a7c11: MDEV-8380: Subquery parse error
by Sergei Golubchik 14 Sep '15

14 Sep '15

Hi, Sanja! On Aug 31, sanja(a)mariadb.com wrote: > revision-id: 93a7c11c51e2f5c0ca98600924172e452b6188b6 (mariadb-10.1.6-24-g93a7c11) > parent(s): d07b780db239a909e667edf5657e3633e80d1451 > committer: Oleksandr Byelkin > timestamp: 2015-08-31 13:10:01 +0200 > message: > > MDEV-8380: Subquery parse error > > backport mysql parser fixes > 0034963fbf199696792491bcb79d5f0731c98804 > 5948561812bc691bd0c13cf518a3fe77d9daf920 > diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc > index 6c835c4..1d9aca9 100644 > --- a/sql/sql_lex.cc > +++ b/sql/sql_lex.cc > @@ -546,6 +546,7 @@ void lex_start(THD *thd) > lex->limit_rows_examined_cnt= ULONGLONG_MAX; > lex->var_list.empty(); > lex->stmt_var_list.empty(); > + lex->proc_list.elements=0; why? this wasn't in the patches you've backported. > > lex->is_lex_started= TRUE; > DBUG_VOID_RETURN; > @@ -852,6 +853,29 @@ bool Lex_input_stream::get_text(LEX_STRING *dst, int pre_skip, int post_skip) > } > > > +uint Lex_input_stream::get_lineno(const char *raw_ptr) > +{ > + DBUG_ASSERT(m_buf <= raw_ptr && raw_ptr < m_end_of_query); > + if (!(m_buf <= raw_ptr && raw_ptr < m_end_of_query)) > + return 1; > + > + uint ret= 1; > + const CHARSET_INFO *cs= m_thd->charset(); > + for (const char *c= m_buf; c < raw_ptr; c++) > + { > + uint mb_char_len; > + if (use_mb(cs) && (mb_char_len= my_ismbchar(cs, c, m_end_of_query))) > + { > + c+= mb_char_len - 1; // skip the rest of the multibyte character > + continue; // we don't expect '\n' there > + } > + if (*c == '\n') > + ret++; > + } > + return ret; > +} why? this doesn't seem to be used anywhere. > + > + > /* > ** Calc type of integer; long integer, longlong integer or real. > ** Returns smallest type that match the string. > diff --git a/sql/sql_lex.h b/sql/sql_lex.h > index 09a3d5e..529c4d5 100644 > --- a/sql/sql_lex.h > +++ b/sql/sql_lex.h > @@ -2087,6 +2087,8 @@ class Lex_input_stream > CHARSET_INFO *txt_cs, > const char *end_ptr); > > + uint get_lineno(const char *raw_ptr); > + > /** Current thread. */ > THD *m_thd; > > diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc > index 5e58ceb..f7eed09 100644 > --- a/sql/sql_parse.cc > +++ b/sql/sql_parse.cc > @@ -6932,11 +6932,28 @@ mysql_new_select(LEX *lex, bool move_down) > } > else > { > + bool const outer_most= (lex->current_select->master_unit() == &lex->unit); > + if (outer_most && lex->result) > + { > + my_error(ER_WRONG_USAGE, MYF(0), "UNION", "INTO"); > + DBUG_RETURN(TRUE); > + } > + if (lex->proc_list.elements!=0) > + { > + my_error(ER_WRONG_USAGE, MYF(0), "UNION", > + "SELECT ... PROCEDURE ANALYSE()"); > + DBUG_RETURN(TRUE); > + } why couldn't parser do it? > if (lex->current_select->order_list.first && !lex->current_select->braces) > { > my_error(ER_WRONG_USAGE, MYF(0), "UNION", "ORDER BY"); > DBUG_RETURN(1); > } > + if (lex->current_select->explicit_limit && !lex->current_select->braces) > + { > + my_error(ER_WRONG_USAGE, MYF(0), "UNION", "LIMIT"); > + DBUG_RETURN(1); > + } why couldn't parser do it? > select_lex->include_neighbour(lex->current_select); > SELECT_LEX_UNIT *unit= select_lex->master_unit(); > if (!unit->fake_select_lex && unit->add_fake_select_lex(lex->thd)) > diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy > index 0e2db26..b79c2ce 100644 > --- a/sql/sql_yacc.yy > +++ b/sql/sql_yacc.yy > @@ -1,5 +1,5 @@ > /* > - Copyright (c) 2000, 2015, Oracle and/or its affiliates. > + Copyrig ht(c) 2000, 2015, Oracle and/or its affiliates. typo? > Copyright (c) 2010, 2015, MariaDB > > This program is free software; you can redistribute it and/or modify > @@ -1001,10 +1001,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > %parse-param { THD *thd } > %lex-param { THD *thd } > /* > - Currently there are 164 shift/reduce conflicts. > + Currently there are 160 shift/reduce conflicts. > We should not introduce new conflicts any more. > */ > -%expect 164 > +%expect 160 > > /* > Comments for TOKENS. > @@ -1731,6 +1731,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > opt_default_time_precision > case_stmt_body opt_bin_mod > opt_if_exists_table_element opt_if_not_exists_table_element > + opt_into opt_procedure_clause > > %type <object_ddl_options> > create_or_replace > @@ -5548,7 +5549,7 @@ create_select: > { > Select->parsing_place= NO_MATTER; > } > - opt_select_from > + table_expression > { > /* > The following work only with the local list, the global list > @@ -5943,11 +5944,6 @@ merge_insert_types: > | LAST_SYM { $$= MERGE_INSERT_TO_LAST; } > ; > > -opt_select_from: > - opt_limit_clause {} > - | select_from opt_select_lock_type > - ; > - > udf_type: > STRING_SYM {$$ = (int) STRING_RESULT; } > | REAL {$$ = (int) REAL_RESULT; } > @@ -8397,6 +8393,7 @@ select_paren_derived: > Lex->current_select->set_braces(true); > } > SELECT_SYM select_part2_derived > + table_expression > { > if (setup_select_in_parentheses(Lex)) > MYSQL_YYABORT; > @@ -8414,7 +8411,45 @@ select_init2: > union_clause > ; > > +/* > + Theoretically we can merge all 3 right hand sides of the select_part2 > + rule into one, however such a transformation adds one shift/reduce > + conflict more. > +*/ > select_part2: > + select_options_and_item_list > + opt_order_clause > + opt_limit_clause > + opt_select_lock_type > + | select_options_and_item_list into opt_select_lock_type > + | select_options_and_item_list > + opt_into > + from_clause > + opt_where_clause > + opt_group_clause > + opt_having_clause > + opt_order_clause > + opt_limit_clause > + opt_procedure_clause > + opt_into > + opt_select_lock_type why not table_expression here? > + { > + if ($2 && $10) > + { > + /* double "INTO" clause */ > + my_error(ER_WRONG_USAGE, MYF(0), "INTO", "INTO"); > + MYSQL_YYABORT; > + } > + if ($9 && ($2 || $10)) > + { > + /* "INTO" with "PROCEDURE ANALYSE" */ > + my_error(ER_WRONG_USAGE, MYF(0), "PROCEDURE", "INTO"); > + MYSQL_YYABORT; > + } > + } Why couldn't parser do that? > + ; > + > +select_options_and_item_list: > { > LEX *lex= Lex; > SELECT_LEX *sel= lex->current_select; > @@ -8426,27 +8461,36 @@ select_part2: > { > Select->parsing_place= NO_MATTER; > } > - select_into opt_select_lock_type > ; > > -select_into: > - opt_order_clause opt_limit_clause {} > - | into > - | select_from > - | into select_from > - | select_from into > +table_expression: > + opt_from_clause > + opt_where_clause > + opt_group_clause > + opt_having_clause > + opt_order_clause > + opt_limit_clause > + opt_procedure_clause > + opt_select_lock_type > + ; > + > +from_clause: > + FROM table_reference_list > + ; > + > +opt_from_clause: > + /* empty */ > + | from_clause > ; > > -select_from: > - FROM join_table_list > +table_reference_list: > + join_table_list > { > Select->context.table_list= > Select->context.first_name_resolution_table= > Select->table_list.first; > } > - opt_where_clause opt_group_clause opt_having_clause > - opt_order_clause opt_limit_clause opt_procedure_clause > - | FROM DUAL_SYM opt_where_clause opt_limit_clause > + | DUAL_SYM > /* oracle compatibility: oracle always requires FROM clause, > and DUAL is system table without fields. > Is "SELECT 1 FROM DUAL" any better than "SELECT 1" ? > @@ -10888,9 +10932,7 @@ select_derived_union: > last select in the union. > */ > Lex->pop_context(); > - } > - opt_union_order_or_limit > - { > + > if ($1 != NULL) > { > my_parse_error(ER_THD(thd, ER_SYNTAX_ERROR)); > @@ -10910,12 +10952,14 @@ select_init2_derived: > my_parse_error(ER_THD(thd, ER_SYNTAX_ERROR)); > MYSQL_YYABORT; > } > + /* > if (sel->linkage == UNION_TYPE && > sel->master_unit()->first_select()->braces) > { > my_parse_error(ER_THD(thd, ER_SYNTAX_ERROR)); > MYSQL_YYABORT; > } > + */ what was wrong with that? if it's not needed anymore, delete it, don't just comment it out. > } > ; > > @@ -10932,7 +10976,6 @@ select_part2_derived: > { > Select->parsing_place= NO_MATTER; > } > - opt_select_from opt_select_lock_type > ; > > /* handle contents of parentheses in join expression */ > @@ -10980,7 +11023,7 @@ select_derived2: > { > Select->parsing_place= NO_MATTER; > } > - opt_select_from > + table_expression > ; > > get_select_lex: > @@ -11556,7 +11599,7 @@ choice: > ; > > opt_procedure_clause: > - /* empty */ > + /* empty */ { $$= false; } > | PROCEDURE_SYM ident /* Procedure name */ > { > LEX *lex=Lex; > @@ -11585,6 +11628,9 @@ opt_procedure_clause: > Lex->uncacheable(UNCACHEABLE_SIDEEFFECT); > } > '(' procedure_list ')' > + { > + $$= true; > + } > ; > > procedure_list: > @@ -11661,6 +11707,11 @@ select_outvar: > } > ; > > +opt_into: > + /* empty */ { $$= false; } > + | into { $$= true; } > + ; > + > into: > INTO > { > @@ -12496,7 +12547,8 @@ show_param: > { > LEX *lex= Lex; > lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS; > - } opt_limit_clause > + } > + opt_limit_clause > | RELAYLOG_SYM optional_connection_name EVENTS_SYM binlog_in binlog_from > { > LEX *lex= Lex; > @@ -15836,17 +15888,19 @@ union_option: > > query_specification: > SELECT_SYM select_init2_derived > - { > + table_expression > + { > $$= Lex->current_select->master_unit()->first_select(); > } > | '(' select_paren_derived ')' > + opt_union_order_or_limit > { > $$= Lex->current_select->master_unit()->first_select(); > } > ; > > query_expression_body: > - query_specification opt_union_order_or_limit > + query_specification > | query_expression_body > UNION_SYM union_option > { > @@ -15854,7 +15908,6 @@ query_expression_body: > MYSQL_YYABORT; > } > query_specification > - opt_union_order_or_limit > { > Lex->pop_context(); > $$= $1; > diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result > index 1d29f2c..01cc9d7 100644 > --- a/mysql-test/r/parser.result > +++ b/mysql-test/r/parser.result > @@ -650,3 +650,230 @@ CREATE TABLE t1(a INT); > SELECT * FROM t1 JOIN ((SELECT 1 AS b) UNION ALL (SELECT 2 AS b) ORDER BY b DESC) s1 WHERE a=1; > a b > DROP TABLE t1; > +# > +# Test of collective fix for three parser bugs: > +# > +# Bug #17727401, Bug #17426017, Bug #17473479: > +# The server accepts wrong syntax and then fails in different ways > +# > +CREATE TABLE t1 (i INT); > +# bug #17426017 > +SELECT (SELECT EXISTS(SELECT * LIMIT 1 ORDER BY VALUES (c00))); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY VALUES (c00)))' at line 1 > +# bug#17473479 > +CREATE TABLE a(a int); > +CREATE TABLE b(a int); > +DELETE FROM b ORDER BY(SELECT 1 FROM a ORDER BY a ORDER BY a); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY a)' at line 1 > +DROP TABLE a, b; > +# bug #17727401 > +SELECT '' IN (SELECT '1' c FROM t1 ORDER BY '' ORDER BY '') FROM t1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY '') FROM t1' at line 1 > +# regression & coverage tests > +# uniform syntax for FROM DUAL clause: > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE; > +1 > +1 > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE; > +ERROR HY000: Can't use ORDER clause with this procedure > +SELECT 1 FROM > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE) a; > +1 > +1 > +SELECT 1 FROM > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE) a; > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +SELECT 1 FROM t1 > +WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE); > +1 > +SELECT 1 FROM t1 > +WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE); > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE; > +1 > +1 > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE; > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +SELECT 1 FROM DUAL PROCEDURE ANALYSE() > +UNION > +SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and SELECT ... PROCEDURE ANALYSE() > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +FOR UPDATE); > +1 > +1 > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > +PROCEDURE ANALYSE() FOR UPDATE); > +ERROR HY000: Incorrect usage of PROCEDURE and subquery > +# "FOR UPDATE" tests > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +1 > +SELECT 1 FROM t1 FOR UPDATE UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 FOR UPDATE; > +1 > +# "INTO" clause tests > +SELECT 1 FROM t1 INTO @var17727401; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 FROM DUAL INTO @var17727401; > +SELECT 1 INTO @var17727401; > +SELECT 1 INTO @var17727401 FROM t1; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 INTO @var17727401 FROM DUAL; > +SELECT 1 INTO @var17727401_1 FROM t1 INTO @var17727401_2; > +ERROR HY000: Incorrect usage of INTO and INTO > +SELECT 1 INTO @var17727401_1 FROM DUAL > +INTO @var17727401_2; > +ERROR HY000: Incorrect usage of INTO and INTO > +SELECT 1 INTO @var17727401 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 INTO @var17727401; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 FROM t1 WHERE 1 INTO @var17727401 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1' at line 1 > +SELECT 1 INTO @var17727401_1 > +FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 > +INTO @var17727401_2; > +ERROR HY000: Incorrect usage of INTO and INTO > +SELECT (SELECT 1 FROM t1 INTO @var17727401); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var17727401)' at line 1 > +SELECT 1 FROM (SELECT 1 FROM t1 INTO @var17727401) a; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var17727401) a' at line 1 > +SELECT EXISTS(SELECT 1 FROM t1 INTO @var17727401); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var17727401)' at line 1 > +SELECT 1 FROM t1 INTO @var17727401 UNION SELECT 1 FROM t1 INTO t1; > +ERROR HY000: Incorrect usage of UNION and INTO > +(SELECT 1 FROM t1 INTO @var17727401) UNION (SELECT 1 FROM t1 INTO t1); > +ERROR HY000: Incorrect usage of UNION and INTO > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 INTO @var17727401; > +Warnings: > +Warning 1329 No data - zero rows fetched, selected, or processed > +SELECT 1 INTO @var17727401 FROM t1 PROCEDURE ANALYSE(); > +ERROR HY000: Incorrect usage of PROCEDURE and INTO > +SELECT 1 FROM t1 PROCEDURE ANALYSE() INTO @var17727401; > +ERROR HY000: Incorrect usage of PROCEDURE and INTO > +# ORDER and LIMIT clause combinations > +(SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1; > +1 > +(SELECT 1 FROM t1 LIMIT 1) LIMIT 1; > +1 > +((SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1) ORDER BY 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1) ORDER BY 1' at line 1 > +((SELECT 1 FROM t1 LIMIT 1) LIMIT 1) LIMIT 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LIMIT 1) LIMIT 1' at line 1 > +(SELECT 1 FROM t1 ORDER BY 1) LIMIT 1; > +1 > +(SELECT 1 FROM t1 LIMIT 1) ORDER BY 1; > +1 > +((SELECT 1 FROM t1 ORDER BY 1) LIMIT 1) ORDER BY 1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LIMIT 1) ORDER BY 1)' at line 1 > +((SELECT 1 FROM t1 LIMIT 1) ORDER BY 1) LIMIT 1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1) LIMIT 1)' at line 1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1; > +1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1); > +(SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1) > +NULL > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1) a; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1; > +1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1); > +(SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1) > +NULL > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1) a; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1); > +(SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1) > +NULL > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1) a; > +1 > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1' at line 1 > +SELECT (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1)' at line 1 > +SELECT 1 FROM (SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1) a; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1) a' at line 1 > +SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1); > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1; > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1 UNION SELECT 1 FROM t1' at line 1 > +SELECT (SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1); > +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ORDER BY 1 UNION SELECT 1 FROM t1)' at line 1 > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1); > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1) a; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1); > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM (SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1) a; > +ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1); > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +SELECT 1 FROM (SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1) a; > +ERROR HY000: Incorrect usage of UNION and ORDER BY > +DROP TABLE t1; > +# > +# MDEV-8380: Subquery parse error > +# > +CREATE TABLE t1 ( a INT); > +INSERT INTO t1 VALUES ( 2 ); > +SELECT * > +FROM ( (SELECT a FROM t1 ORDER BY a) UNION (SELECT 1 as b ORDER BY b ) ) AS a1 > +WHERE a1.a = 1 OR a1.a = 2; > +a > +2 > +1 > +DROP TABLE t1; > diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result > index 3732f62..b9f9fb0 100644 > --- a/mysql-test/r/subselect.result > +++ b/mysql-test/r/subselect.result > @@ -5132,8 +5132,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5175,7 +5176,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5294,7 +5295,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result > index 140b790..902c45f 100644 > --- a/mysql-test/r/subselect_no_exists_to_in.result > +++ b/mysql-test/r/subselect_no_exists_to_in.result > @@ -5134,8 +5134,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5177,7 +5178,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5296,7 +5297,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result > index 99ac9f4..89034b7 100644 > --- a/mysql-test/r/subselect_no_mat.result > +++ b/mysql-test/r/subselect_no_mat.result > @@ -5132,8 +5132,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5175,7 +5176,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5294,7 +5295,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result > index 7ecd40c..6e90aac 100644 > --- a/mysql-test/r/subselect_no_opts.result > +++ b/mysql-test/r/subselect_no_opts.result > @@ -5128,8 +5128,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5171,7 +5172,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5290,7 +5291,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result > index c70db6f..1c18817 100644 > --- a/mysql-test/r/subselect_no_scache.result > +++ b/mysql-test/r/subselect_no_scache.result > @@ -5138,8 +5138,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5181,7 +5182,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5300,7 +5301,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result > index 6a7d6b3..de9c4e8 100644 > --- a/mysql-test/r/subselect_no_semijoin.result > +++ b/mysql-test/r/subselect_no_semijoin.result > @@ -5128,8 +5128,9 @@ SELECT a FROM t1 WHERE a = 2 > a > 1 > 2 > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > +a > +1 > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > a > 1 > @@ -5171,7 +5172,7 @@ a 1 > 1 1 > 2 1 > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 > +ERROR 42000: Every derived table must have its own alias > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 > SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; > @@ -5290,7 +5291,10 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 > +ERROR 42000: Every derived table must have its own alias > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > +1 > +1 > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > 1 > 1 > diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result > index ef1749e..9b7a1c5 100644 > --- a/mysql-test/r/union.result > +++ b/mysql-test/r/union.result > @@ -89,6 +89,10 @@ id select_type table type possible_keys key key_len ref rows filtered Extra > NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL NULL Using filesort > Warnings: > Note 1003 (select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` limit 2) union all (select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` order by `test`.`t2`.`a` limit 1) order by `b` desc > +select count(*) from ( > +(select a,b from t1 limit 2) union all (select a,b from t2 order by a)) q; > +count(*) > +6 > (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; > a b > 1 a > @@ -96,6 +100,10 @@ a b > select found_rows(); > found_rows() > 6 > +select count(*) from ( > +select a,b from t1 union all select a,b from t2) q; > +count(*) > +8 > select sql_calc_found_rows a,b from t1 union all select a,b from t2 limit 2; > a b > 1 a > @@ -308,12 +316,20 @@ create table t1 (a int); > insert into t1 values (1),(2),(3); > create table t2 (a int); > insert into t2 values (3),(4),(5); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2)) q; > +COUNT(*) > +6 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2) LIMIT 1; > a > 1 > select found_rows(); > found_rows() > 6 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > +COUNT(*) > +4 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2) LIMIT 2; > a > 1 > @@ -321,6 +337,10 @@ a > select found_rows(); > found_rows() > 4 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > +COUNT(*) > +4 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2); > a > 1 > @@ -330,6 +350,10 @@ a > select found_rows(); > found_rows() > 4 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1)) q; > +COUNT(*) > +4 > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1); > a > 1 > @@ -345,6 +369,16 @@ a > select found_rows(); > found_rows() > 4 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; > +a > +1 > +select found_rows(); > +found_rows() > +4 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2; > ERROR HY000: Incorrect usage of UNION and LIMIT > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION all SELECT * FROM t2 LIMIT 2; > @@ -354,13 +388,29 @@ a > select found_rows(); > found_rows() > 6 > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > +COUNT(*) > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2; > a > 1 > 2 > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all SELECT * FROM t2 LIMIT 2; > +a > +1 > +3 > select found_rows(); > found_rows() > -5 > +4 > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION all SELECT * FROM t2) q; > +COUNT(*) > +6 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 100; > a > 1 > @@ -373,10 +423,39 @@ found_rows() > 5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100 UNION SELECT * FROM t2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 100) UNION SELECT * FROM t2) q; > +COUNT(*) > +5 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100) UNION SELECT * FROM t2; > +a > +1 > +2 > +3 > +4 > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2; > +a > +1 > +3 > +4 > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2 LIMIT 2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +COUNT(*) > +4 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 2; > +a > +1 > +3 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2,2; > a > 3 > @@ -384,8 +463,21 @@ a > select found_rows(); > found_rows() > 5 > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > +COUNT(*) > +5 > SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2 UNION SELECT * FROM t2; > ERROR HY000: Incorrect usage of UNION and LIMIT > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 limit 2,2) UNION SELECT * FROM t2) q; > +COUNT(*) > +3 > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2) UNION SELECT * FROM t2; > +a > +3 > +4 > +5 > SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1; > a > 5 > diff --git a/mysql-test/t/parser.test b/mysql-test/t/parser.test > index 31c6ab9..0a19b03 100644 > --- a/mysql-test/t/parser.test > +++ b/mysql-test/t/parser.test > @@ -765,3 +765,259 @@ DROP TABLE t1; > CREATE TABLE t1(a INT); > SELECT * FROM t1 JOIN ((SELECT 1 AS b) UNION ALL (SELECT 2 AS b) ORDER BY b DESC) s1 WHERE a=1; > DROP TABLE t1; > + > + > +--echo # > +--echo # Test of collective fix for three parser bugs: > +--echo # > +--echo # Bug #17727401, Bug #17426017, Bug #17473479: > +--echo # The server accepts wrong syntax and then fails in different ways > +--echo # > + > +CREATE TABLE t1 (i INT); > + > +--echo # bug #17426017 > +--error ER_PARSE_ERROR > +SELECT (SELECT EXISTS(SELECT * LIMIT 1 ORDER BY VALUES (c00))); > + > +--echo # bug#17473479 > +CREATE TABLE a(a int); > +CREATE TABLE b(a int); > +--error ER_PARSE_ERROR > +DELETE FROM b ORDER BY(SELECT 1 FROM a ORDER BY a ORDER BY a); > +DROP TABLE a, b; > + > +--echo # bug #17727401 > +--error ER_PARSE_ERROR > +SELECT '' IN (SELECT '1' c FROM t1 ORDER BY '' ORDER BY '') FROM t1; > + > +--echo # regression & coverage tests > + > +--echo # uniform syntax for FROM DUAL clause: > + > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE; > + > +--error ER_ORDER_WITH_PROC > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE; > + > +SELECT 1 FROM > + (SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE) a; > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM > + (SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE) a; > + > +SELECT 1 FROM t1 > + WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE); > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 > + WHERE EXISTS(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE); > + > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE; > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 > +UNION > +SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE; > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM DUAL PROCEDURE ANALYSE() > +UNION > +SELECT 1 FROM t1; > + > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + FOR UPDATE); > + > +--error ER_WRONG_USAGE > +(SELECT 1 FROM t1) > +UNION > +(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 > + PROCEDURE ANALYSE() FOR UPDATE); > + > +--echo # "FOR UPDATE" tests > + > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +SELECT 1 FROM t1 FOR UPDATE UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 FOR UPDATE; > + > + > +--echo # "INTO" clause tests > + > +SELECT 1 FROM t1 INTO @var17727401; > +SELECT 1 FROM DUAL INTO @var17727401; > +SELECT 1 INTO @var17727401; > + > +SELECT 1 INTO @var17727401 FROM t1; > +SELECT 1 INTO @var17727401 FROM DUAL; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401_1 FROM t1 INTO @var17727401_2; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401_1 FROM DUAL > + INTO @var17727401_2; > + > +SELECT 1 INTO @var17727401 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > +SELECT 1 FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 INTO @var17727401; > + > +--error ER_PARSE_ERROR > +SELECT 1 FROM t1 WHERE 1 INTO @var17727401 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401_1 > + FROM t1 WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1 LIMIT 1 > + INTO @var17727401_2; > + > +--error ER_PARSE_ERROR > +SELECT (SELECT 1 FROM t1 INTO @var17727401); > +--error ER_PARSE_ERROR > +SELECT 1 FROM (SELECT 1 FROM t1 INTO @var17727401) a; > +--error ER_PARSE_ERROR > +SELECT EXISTS(SELECT 1 FROM t1 INTO @var17727401); > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 INTO @var17727401 UNION SELECT 1 FROM t1 INTO t1; > +--error ER_WRONG_USAGE > +(SELECT 1 FROM t1 INTO @var17727401) UNION (SELECT 1 FROM t1 INTO t1); > + > +SELECT 1 FROM t1 UNION SELECT 1 FROM t1 INTO @var17727401; > + > +--error ER_WRONG_USAGE > +SELECT 1 INTO @var17727401 FROM t1 PROCEDURE ANALYSE(); > + > +--error ER_WRONG_USAGE > +SELECT 1 FROM t1 PROCEDURE ANALYSE() INTO @var17727401; > + > +--echo # ORDER and LIMIT clause combinations > + > +# Limited support for (SELECT ...) ORDER/LIMIT: > + > +(SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1; > +(SELECT 1 FROM t1 LIMIT 1) LIMIT 1; > + > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 ORDER BY 1) ORDER BY 1) ORDER BY 1; > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 LIMIT 1) LIMIT 1) LIMIT 1; > + > +(SELECT 1 FROM t1 ORDER BY 1) LIMIT 1; > +(SELECT 1 FROM t1 LIMIT 1) ORDER BY 1; > + > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 ORDER BY 1) LIMIT 1) ORDER BY 1); > +--error ER_PARSE_ERROR > +((SELECT 1 FROM t1 LIMIT 1) ORDER BY 1) LIMIT 1); > + > +# ORDER/LIMIT and UNION: > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1; > +eval $q; > +eval SELECT ($q); > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1; > +eval $q; > +eval SELECT ($q); > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1; > +eval $q; > +eval SELECT ($q); > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 UNION SELECT 1 FROM t1 LIMIT 1 ORDER BY 1; > +--error ER_PARSE_ERROR > +eval $q; > +--error ER_PARSE_ERROR > +eval SELECT ($q); > +--error ER_PARSE_ERROR > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 UNION SELECT 1 FROM t1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 ORDER BY 1 UNION SELECT 1 FROM t1; > +--error ER_PARSE_ERROR > +eval $q; > +--error ER_PARSE_ERROR > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 LIMIT 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 LIMIT 1 UNION SELECT 1 FROM t1 ORDER BY 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +let $q=SELECT 1 FROM t1 ORDER BY 1 UNION SELECT 1 FROM t1 LIMIT 1; > +--error ER_WRONG_USAGE > +eval $q; > +--error ER_WRONG_USAGE > +eval SELECT ($q); > +--error ER_WRONG_USAGE > +eval SELECT 1 FROM ($q) a; > + > +DROP TABLE t1; > + > +--echo # > +--echo # MDEV-8380: Subquery parse error > +--echo # > +CREATE TABLE t1 ( a INT); > +INSERT INTO t1 VALUES ( 2 ); > +SELECT * > +FROM ( (SELECT a FROM t1 ORDER BY a) UNION (SELECT 1 as b ORDER BY b ) ) AS a1 > +WHERE a1.a = 1 OR a1.a = 2; > +DROP TABLE t1; > diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test > index 80efe7a..8fb9658 100644 > --- a/mysql-test/t/subselect.test > +++ b/mysql-test/t/subselect.test > @@ -4274,8 +4274,7 @@ SELECT * FROM ( > > # This was not allowed previously. Possibly, it should be allowed on the future. > # For now, the intent is to keep the fix as non-intrusive as possible. > ---error ER_PARSE_ERROR > -SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); > +SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a) q; > SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; > SELECT * FROM (SELECT 1 UNION SELECT 1) t1a; > --error ER_PARSE_ERROR > @@ -4310,7 +4309,7 @@ SELECT * FROM (SELECT 1 a UNION SELECT 1 a ORDER BY a LIMIT 1) t1a; > # aliases after. > # > SELECT * FROM t1 JOIN (SELECT 1 UNION SELECT 1) alias ON 1; > ---error ER_PARSE_ERROR > +--error ER_DERIVED_MUST_HAVE_ALIAS > SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; > --error ER_PARSE_ERROR > SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; > @@ -4402,8 +4401,9 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); > > --error ER_PARSE_ERROR > SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); > ---error ER_PARSE_ERROR > +--error ER_DERIVED_MUST_HAVE_ALIAS > SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); > +SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ) a; > SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; > > --error ER_PARSE_ERROR > diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test > index b8b040b..56fb2e3 100644 > --- a/mysql-test/t/union.test > +++ b/mysql-test/t/union.test > @@ -26,8 +26,12 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g > --error 1250 > (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b; > explain extended (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; > +select count(*) from ( > +(select a,b from t1 limit 2) union all (select a,b from t2 order by a)) q; > (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; > select found_rows(); > +select count(*) from ( > +select a,b from t1 union all select a,b from t2) q; > select sql_calc_found_rows a,b from t1 union all select a,b from t2 limit 2; > select found_rows(); > > @@ -206,18 +210,30 @@ create table t2 (a int); > insert into t2 values (3),(4),(5); > > # Test global limits > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2) LIMIT 1; > select found_rows(); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2) LIMIT 2; > select found_rows(); > > # Test cases where found_rows() should return number of returned rows > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all (SELECT * FROM t2); > select found_rows(); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1)) q; > (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1); > select found_rows(); > (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; > select found_rows(); > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; > +select found_rows(); > > # In these case found_rows() should work > --error ER_WRONG_USAGE > @@ -226,20 +242,41 @@ SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION all SELECT * FROM t2 LIMIT 2; > select found_rows(); > > # The following examples will not be exact > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION all SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION all SELECT * FROM t2 LIMIT 2; > select found_rows(); > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION all SELECT * FROM t2) q; > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 100; > select found_rows(); > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100 UNION SELECT * FROM t2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 100) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100) UNION SELECT * FROM t2; > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2; > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2 LIMIT 2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 2; > SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2,2; > select found_rows(); > +SELECT COUNT(*) FROM ( > +SELECT * FROM t1 UNION SELECT * FROM t2) q; > --error ER_WRONG_USAGE > SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2 UNION SELECT * FROM t2; > +SELECT COUNT(*) FROM ( > +(SELECT * FROM t1 limit 2,2) UNION SELECT * FROM t2) q; > +(SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2) UNION SELECT * FROM t2; > > # Test some limits with ORDER BY > SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1; Regards, Sergei

2 2

Re: [Maria-developers] [Commits] 6811945e: MDEV-6756: map a linux pid (child pid) to a connection id shown in the output of SHOW PROCESSLIST
by Sergei Golubchik 14 Sep '15

14 Sep '15

Hi, Sanja! On Aug 12, sanja(a)mariadb.com wrote: > revision-id: 6811945eaf6a6e979d92739399b084bf4e00ae2d (mariadb-10.1.6-12-g6811945e) > parent(s): 86a3613d4e981c341e38291c9eeec5dc9f836fae > committer: Oleksandr Byelkin > timestamp: 2015-08-12 23:09:48 +0200 > message: > > MDEV-6756: map a linux pid (child pid) to a connection id shown in the output of SHOW PROCESSLIST > > Added tid & pid for Linux. > > diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result > index 2a918ad..5b3370b 100644 > --- a/mysql-test/r/information_schema.result > +++ b/mysql-test/r/information_schema.result > @@ -2066,3 +2066,18 @@ Variable_name Value > Opened_tables 3 > drop database mysqltest; > drop database db1; > +SHOW PROCESSLIST; > +Id User Host db Command Time State Info Progress > +# root # NULL Query # # SHOW PROCESSLIST 0.000 > +set @@old_mode=""; > +SHOW PROCESSLIST; Eh, no, please, don't change SHOW PROCESSLIST. Only add new columns to I_S.PROCESSLIST. And without OLD_MODE. > diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt > index 033a0e0..d1fbaa3 100644 > --- a/sql/CMakeLists.txt > +++ b/sql/CMakeLists.txt > @@ -143,6 +143,10 @@ SET (SQL_SOURCE > ${MYSYS_LIBWRAP_SOURCE} > ) > > +IF (CMAKE_SYSTEM_NAME MATCHES "Linux") > + ADD_DEFINITIONS(-DHAVE_TID_SYSCALL) > +ENDIF() Don't match OS name please, better use #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif ... #ifdef __NR_gettid ... #endif > + > IF (CMAKE_SYSTEM_NAME MATCHES "Linux" OR > CMAKE_SYSTEM_NAME MATCHES "Windows" OR > CMAKE_SYSTEM_NAME MATCHES "SunOS" OR > diff --git a/sql/sql_class.cc b/sql/sql_class.cc > index bf161b2..20c03fe 100644 > --- a/sql/sql_class.cc > +++ b/sql/sql_class.cc > @@ -2062,6 +2068,13 @@ bool THD::store_globals() > This allows us to move THD to different threads if needed. > */ > mysys_var->id= thread_id; > +#ifdef HAVE_TID_SYSCALL > + os_pid= getpid(); why would you want to have pid there? isn't it the same for all threads? > + os_thread_id= syscall(__NR_gettid); > +#else > + os_pid= 0; > + os_thread_id= 0; > +#endif > real_id= pthread_self(); // For debugging > mysys_var->stack_ends_here= thread_stack + // for consistency, see libevent_thread_proc > STACK_DIRECTION * (long)my_thread_stack_size; I didn't review the rest of the patch as without old_mode and SHOW PROCESSLIST changes most of it will disappear. Regards, Sergei

2 2

Re: [Maria-developers] [Commits] 5fab5b6: MDEV-8764: Wrong error when encrypted table can't be decrypted.
by Sergei Golubchik 13 Sep '15

13 Sep '15

Hi, Jan! On Sep 08, Jan Lindström wrote: > MDEV-8764: Wrong error when encrypted table can't be decrypted. > > Add a new error message when table is encrypted but decryption > fails. Use this new error message on InnoDB/XtraDB. > > diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h > index a7afcfe..9e452b0 100644 > --- a/include/my_handler_errors.h > +++ b/include/my_handler_errors.h > @@ -94,7 +94,8 @@ static const char *handler_error_messages[]= > "Operation was interrupted by end user (probably kill command?)", > "Disk full", > "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this", > - "Too many words in a FTS phrase or proximity search" > + "Too many words in a FTS phrase or proximity search", > + "Table encrypted but decryption failed" I'm not sure I like the wording ("table is encrypted" adds no useful information, it's not like there can be another error "table is not encrypted but decryption failed"). But that's up to you. And yes, I agree that this situation deserves a dedicated error message. > }; > > #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ > diff --git a/sql/handler.cc b/sql/handler.cc > index 1d1dae7..566db8a 100644 > --- a/sql/handler.cc > +++ b/sql/handler.cc > @@ -3518,6 +3519,10 @@ void handler::print_error(int error, myf errflag) > my_error(ER_NO_SUCH_TABLE_IN_ENGINE, errflag, table_share->db.str, > table_share->table_name.str); > DBUG_VOID_RETURN; > + case HA_ERR_DECRYPTION_FAILED: > + my_error(ER_DECRYPTION_FAILED, errflag, table_share->db.str, > + table_share->table_name.str); > + DBUG_VOID_RETURN; Is that needed? I'd rather use the default ER_GET_ERRMSG, which would be Got error 192 'Table encrypted but decryption failed" from InnoDB I think this is perfectly adequate error for internal engine errors. ER_xxx is for upper-level errors. > case HA_ERR_RBR_LOGGING_FAILED: > textno= ER_BINLOG_ROW_LOGGING_FAILED; > break; > diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt > index 59908dc..ff72a26 100644 > --- a/sql/share/errmsg-utf8.txt > +++ b/sql/share/errmsg-utf8.txt > @@ -7136,3 +7136,5 @@ ER_KILL_QUERY_DENIED_ERROR > eng "You are not owner of query %lu" > ger "Sie sind nicht Eigentümer von Abfrage %lu" > rus "Вы не являетесь владельцем запроса %lu" > +ER_DECRYPTION_FAILED 42S02 > + eng "Table '%-.192s.%-.192s' encrypted but decryption failed." In general, please prefer %`s.%`s over '%s.%s' the former uses correct identifier quoting, the second does not Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 7fd5554: MDEV-5171: Add support for --innodb-optimize-keys to mysqldump.
by Sergei Golubchik 12 Sep '15

12 Sep '15

Hi, Jan! First, we've discussed adding support for ALTER TABLE ... DISABLE KEYS to InnoDB. Did you try that? That would've been a better approach, generally I'd like to avoid adding plugin-specific options to a mysqldump utility (although, of course, InnoDB is not just any plugin, so we can always make an exception for it). On Jul 27, Jan Lindström wrote: > revision-id: 7fd55542893b6d9e75406e39b7be672d8a8f473c > parent(s): a6ab8ef9d7d465a3f0bc1cff6034ca97575629dd > committer: Jan Lindström > branch nick: 10.0-git > timestamp: 2015-07-27 13:02:57 +0300 > message: > > MDEV-5171: Add support for --innodb-optimize-keys to mysqldump. > > Merged revision 93 from bzr+ssh://bazaar.launchpad.net/+branch/percona-server/5.6/ > authored by Alexey Kopytov. > > However, internal parser is rewriten to support unquoted identifiers and > multi-column keys. > > This patch expands the applicability of InnoDB fast index creation to > mysqldump, ALTER TABLE and OPTIMIZE TABLE as follows: > > 1. mysqldump has now a new option, --innodb-optimize-keys, which changes > the way InnoDB tables are dumped so that secondary and foreign keys are > created after loading the data thus taking advantage of fast index > creation. > > This part of the patch is an implementation of the feature request > reported as MySQL bug #49120. > > More specifically: > > - KEY, UNIQUE KEY and CONSTRAINT specifications are omitted from CREATE > TABLE corresponding to InnoDB tables. > > - an additional ALTER TABLE is issued after dumping the data to create > the previously omitted keys. > > Delaying foreign key creation does not introduce any additional risks as > mysqldump always prepends its output with SET FOREIGN_KEY_CHECKS=0 anyway. > > 2. When ALTER TABLE requires a table copy, secondary keys are now dropped > and recreated later after copying the data. The following restrictions > apply: > > - only non-unique keys can be involved in this optimization > > - if the table contains foreign keys, or a foreign key is being added as > a part of the current ALTER TABLE statement, the optimization is > disabled for all keys. > > This part of the patch is an implementation of the feature request > reported as MySQL bug #57583. > > 3. As OPTIMIZE TABLE is mapped to ALTER TABLE ... ENGINE=InnoDB for > InnoDB tables, it now also benefits from fast index creation with the > same restrictions as for ALTER TABLE. > This is a good comment, but a bit confusing. It should explicitly say somehow that item 1 is what this patch implements and items 2 and 3 are existing InnoDB features. Currently the comment creates an impression that all 1-3 are implemented in the patch. > > diff --git a/client/mysqldump.c b/client/mysqldump.c > index e4683ab..b8874e7 100644 > --- a/client/mysqldump.c > +++ b/client/mysqldump.c > @@ -84,12 +86,30 @@ > #define IGNORE_DATA 0x01 /* don't dump data for this table */ > #define IGNORE_INSERT_DELAYED 0x02 /* table doesn't support INSERT DELAYED */ > > +typedef enum { > + KEY_TYPE_NONE, > + KEY_TYPE_PRIMARY, > + KEY_TYPE_UNIQUE, > + KEY_TYPE_NON_UNIQUE, > + KEY_TYPE_FOREIGN > +} key_type_t; > + > /* Chars needed to store LONGLONG, excluding trailing '\0'. */ > #define LONGLONG_LEN 20 > > /* Max length GTID position that we will output. */ > #define MAX_GTID_LENGTH 1024 > > +/* Max length of identifier (columnname, keyname, tablename, etc). */ > +#define MAX_ID_LENGTH 65 Use SAFE_NAME_LEN instead, it's defined in mysql_com.h that mysqldump.c already includes > + > +/* Data structure for holding position information > +for simple keyword parser. */ > +typedef struct { > + char* m_start; > + char* m_pos; > +} simple_parser_t; > + > static void add_load_option(DYNAMIC_STRING *str, const char *option, > const char *option_value); > static ulong find_set(TYPELIB *lib, const char *x, uint length, > @@ -2843,6 +3296,9 @@ static uint get_table_structure(char *table, char *db, char *table_type, > > row= mysql_fetch_row(result); > > + if (opt_innodb_optimize_keys && !opt_comments && !strcmp(table_type, "InnoDB")) > + skip_secondary_keys(row[1], table); Okay, so opt_innodb_optimize_keys needs !opt_comments. Please, add a check, like if (opt_innodb_optimize_keys && opt_comments) { fprintf(stderr, "%s: You can't use --innodb-optimize-keys and " "--comments at the same time.\n", my_progname_short); return(EX_USAGE); } a good place for a check like this is get_options() function. > + > is_log_table= general_log_or_slow_log_tables(db, table); > if (is_log_table) > row[1]+= 13; /* strlen("CREATE TABLE ")= 13 */ The parser looked fine on the first glance, but I didn't review every single line of it. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 7206e6f: MDEV-8577: With enforce-storage-engine mysql_upgrade corrupts the schema:
by Sergei Golubchik 11 Sep '15

11 Sep '15

Hi, Jan! On Aug 08, Jan Lindström wrote: > MDEV-8577: With enforce-storage-engine mysql_upgrade corrupts the schema: > ALTER TABLE should either bypass enforce-storage-engine, or mysql_upgrade > should refuse to run > > Allow user to alter contents of existing table without enforcing > storage engine. However, enforce storage engine on ALTER TABLE x ENGINE=y; Good idea, I like this behavior. > diff --git a/sql/sql_table.cc b/sql/sql_table.cc > index 69c87dd..60c4407 100644 > --- a/sql/sql_table.cc > +++ b/sql/sql_table.cc > @@ -9801,8 +9801,12 @@ static bool check_engine(THD *thd, const char *db_name, > *new_engine= ha_checktype(thd, req_engine, no_substitution); > DBUG_ASSERT(*new_engine); > > - /* Enforced storage engine should not be used on bootstrap */ > - if (!in_bootstrap) > + /* Enforced storage engine should not be used on bootstrap > + and in ALTER TABLE that does not use explicit ENGINE = x to > + avoid unwanted unrelated changes.*/ > + if (!in_bootstrap && Note that !in_bootstrap belongs to another bug fix, please don't accidentally push it together with this one. > + !(thd->lex->sql_command == SQLCOM_ALTER_TABLE && > + !(create_info->used_fields & HA_CREATE_USED_ENGINE))) > enf_engine= thd->variables.enforced_table_plugin ? > plugin_hton(thd->variables.enforced_table_plugin) : NULL; Looks good, ok to push! Regards, Sergei

1 0

[Maria-developers] MDEV-8372 Use helper methods introduced in MDEV-7824 all around the code
by Alexander Barkov 11 Sep '15

11 Sep '15

Hi Sergei, Please review my patch for mdev-8372. I found only a few places to reuse the new methods. Also, had to add some more helper methods to make the code clearer. Thanks.

2 3

Re: [Maria-developers] [Commits] 32b1497: MDEV-7990: ERROR 1526 when procedure executed for second time ALTER TABLE partition ... pMAX values less than MAXVALUE
by Sergei Golubchik 11 Sep '15

11 Sep '15

Hi, Sanja! On Aug 06, sanja(a)mariadb.com wrote: > revision-id: 32b14970a1b88571aa96f604e5c59ab6bf1b298c > parent(s): aa5095627e2619bdad7916d33d1016802a84a9e1 > committer: Oleksandr Byelkin > branch nick: server > timestamp: 2015-08-06 14:00:48 +0200 > message: > > MDEV-7990: ERROR 1526 when procedure executed for second time ALTER > TABLE partition ... pMAX values less than MAXVALUE > > Added cleaning partition data which are saved in LEX structure to make > possible correct re-execution of a SP or PS using the code. This seems to be wrong now. It's an old comment, but now your fix works differently, doesn't it? The patch is ok to push, thanks! Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 0a1b60a: MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()
by Sergey Vojtovich 06 Sep '15

06 Sep '15

Hi Sanja, ok to push, a few minor notes JFYI inline. I found only one real bug, but generally I agree that we should fix these fragile macros. On Tue, Sep 01, 2015 at 11:47:09AM +0200, sanja(a)mariadb.com wrote: > revision-id: 0a1b60a8aee4bce3235fd5a1d8cb2231b51ff5cc (mariadb-10.0.21-7-g0a1b60a) > parent(s): 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 > committer: Oleksandr Byelkin > timestamp: 2015-09-01 11:47:06 +0200 > message: > > MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client() > > Expression in macro protected by () > > diff --git a/include/maria.h b/include/maria.h > index 16a9bea..cdaeade 100644 > --- a/include/maria.h > +++ b/include/maria.h > @@ -43,7 +43,7 @@ extern "C" { > #define MARIA_NAME_IEXT ".MAI" > #define MARIA_NAME_DEXT ".MAD" > /* Max extra space to use when sorting keys */ > -#define MARIA_MAX_TEMP_LENGTH 2*1024L*1024L*1024L > +#define MARIA_MAX_TEMP_LENGTH (2*1024L*1024L*1024L) > /* Possible values for maria_block_size (must be power of 2) */ > #define MARIA_KEY_BLOCK_LENGTH 8192 /* default key block length */ > #define MARIA_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */ Was this used at all? May be remove it? > diff --git a/sql/log_slow.h b/sql/log_slow.h > index 2ae07da..3ae2060 100644 > --- a/sql/log_slow.h > +++ b/sql/log_slow.h > @@ -16,23 +16,23 @@ > /* Defining what to log to slow log */ > > #define LOG_SLOW_VERBOSITY_INIT 0 > -#define LOG_SLOW_VERBOSITY_INNODB 1 << 0 > -#define LOG_SLOW_VERBOSITY_QUERY_PLAN 1 << 1 > -#define LOG_SLOW_VERBOSITY_EXPLAIN 1 << 2 > +#define LOG_SLOW_VERBOSITY_INNODB (1 << 0) Was LOG_SLOW_VERBOSITY_INNODB used at all? May be remove it? > +#define LOG_SLOW_VERBOSITY_QUERY_PLAN (1 << 1) > +#define LOG_SLOW_VERBOSITY_EXPLAIN (1 << 2) > > #define QPLAN_INIT QPLAN_QC_NO > > -#define QPLAN_ADMIN 1 << 0 > -#define QPLAN_FILESORT 1 << 1 > -#define QPLAN_FILESORT_DISK 1 << 2 > -#define QPLAN_FULL_JOIN 1 << 3 > -#define QPLAN_FULL_SCAN 1 << 4 > -#define QPLAN_QC 1 << 5 > -#define QPLAN_QC_NO 1 << 6 > -#define QPLAN_TMP_DISK 1 << 7 > -#define QPLAN_TMP_TABLE 1 << 8 > -#define QPLAN_FILESORT_PRIORITY_QUEUE 1 << 9 > +#define QPLAN_ADMIN (1 << 0) > +#define QPLAN_FILESORT (1 << 1) > +#define QPLAN_FILESORT_DISK (1 << 2) > +#define QPLAN_FULL_JOIN (1 << 3) > +#define QPLAN_FULL_SCAN (1 << 4) > +#define QPLAN_QC (1 << 5) > +#define QPLAN_QC_NO (1 << 6) > +#define QPLAN_TMP_DISK (1 << 7) > +#define QPLAN_TMP_TABLE (1 << 8) > +#define QPLAN_FILESORT_PRIORITY_QUEUE (1 << 9) > > /* ... */ > -#define QPLAN_MAX ((ulong) 1) << 31 /* reserved as placeholder */ > +#define QPLAN_MAX (((ulong) 1) << 31) /* reserved as placeholder */ > log_slow.h was fixed in rev.203f4d419 in my 10.0. Did you use outdated tree? I may be wrong, but there seem to be no real bug with QPLAN_QC_NO currently. Just because nobody sets it. So in fact it clears QPLAN_ADMIN, which FWICS is never set at this point. But it is a good to have it fixed nevertheless. Btw, QPLAN_QC_NO doesn't seem to be used in fact. May be remove it? > diff --git a/storage/archive/archive_test.c b/storage/archive/archive_test.c > index d01c1e0..bb052b8 100644 > --- a/storage/archive/archive_test.c > +++ b/storage/archive/archive_test.c > @@ -33,7 +33,7 @@ > > #define ARCHIVE_ROW_HEADER_SIZE 4 > > -#define BUFFER_LEN 1024 + ARCHIVE_ROW_HEADER_SIZE > +#define BUFFER_LEN (1024 + ARCHIVE_ROW_HEADER_SIZE) > > char test_string[BUFFER_LEN]; Alright, there was a bug in this line: assert(write_length != count * BUFFER_LEN); > diff --git a/strings/ctype.c b/strings/ctype.c > index 048fbe3..d8a1dd7 100644 > --- a/strings/ctype.c > +++ b/strings/ctype.c > @@ -264,7 +264,7 @@ static const struct my_cs_file_section_st > } > > #define MY_CS_CSDESCR_SIZE 64 > -#define MY_CS_TAILORING_SIZE 32*1024 > +#define MY_CS_TAILORING_SIZE (32*1024) > #define MY_CS_UCA_VERSION_SIZE 64 > #define MY_CS_CONTEXT_SIZE 64 Was this used at all? May be remove it? Regards, Sergey

2 1

Re: [Maria-developers] [Commits] 62fe87c: MDEV-8663: IF Statement returns multiple values erroneously (or Assertion `!null_value' failed in Item::send(Protocol*, String*))
by Alexander Barkov 04 Sep '15

04 Sep '15

Hi Sanja, From my understanding, the patch fixes consequences of the problem, but not the problem itself. It very likely will still have crashes with slightly modified SQL scripts. The source of the problem is that Item_func_hybrid_result_type::val_decimal() does not return NULL when int_op() or real_op() set null_value to "true". By the way, compare Item_func_hybrid_result_type::val_decimal() with a very similar method Item_func_hybrid_result_type::val_str(). The latter already handle the INT_RESULT and REAL_RESULT cases well and return NULL properly in case of null_value. get_date(), val_int(), val_real() also look fine for me. So the are problems only in val_decimal(). I propose a small patch that fixes the source of the problem. This is the small patch: > @@ -1038,17 +1026,21 @@ my_decimal *Item_func_hybrid_result_type::val_decimal(my_decimal *decimal_value) > case INT_RESULT: > { > longlong result= int_op(); > + if (null_value) > + return NULL; > int2my_decimal(E_DEC_FATAL_ERROR, result, unsigned_flag, decimal_value); > break; > } > case REAL_RESULT: > { > double result= (double)real_op(); > + if (null_value) > + return NULL; > double2my_decimal(E_DEC_FATAL_ERROR, result, decimal_value); > break; > } I also propose an extended patch version, to cover the code with more DBUG_ASSERTs, so in case of the null_value related bugs it crashes much earlier than in Item::send(). It will be easier to debug problems this way. To avoid much code duplication, I added three private helper methods. The extended version of the patch is attached. The scripts from the bug report start to return expected results, with no crashes in DEBUG build, and "mtr --suite=main" works fine. I have not run the entire mtr though, to save time. Greetings. On 09/03/2015 08:00 PM, sanja(a)mariadb.com wrote: > revision-id: 62fe87c5a239c7304b245ce5954c87aecb6382ad (mariadb-5.5.45-1-g62fe87c) > parent(s): fa51f70dc68fe2f3afe943e2c81fcbdb34f16cad > committer: Oleksandr Byelkin > timestamp: 2015-09-03 18:00:43 +0200 > message: > > MDEV-8663: IF Statement returns multiple values erroneously (or Assertion `!null_value' failed in Item::send(Protocol*, String*)) > > keeping contract: NULL value mean NULL pointer in val_str and val_deciman. > > --- > mysql-test/r/func_if.result | 17 +++++++++++++++++ > mysql-test/t/func_if.test | 14 ++++++++++++++ > sql/item_cmpfunc.cc | 6 ++++-- > sql/item_func.cc | 5 +++++ > 4 files changed, 40 insertions(+), 2 deletions(-) > > diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result > index c7f548a..61f63cc 100644 > --- a/mysql-test/r/func_if.result > +++ b/mysql-test/r/func_if.result > @@ -234,3 +234,20 @@ SELECT if(1, NULL, (SELECT min('hello'))); > if(1, NULL, (SELECT min('hello'))) > NULL > End of 5.2 tests > +# > +# MDEV-8663: IF Statement returns multiple values erroneously > +# (or Assertion `!null_value' failed in Item::send(Protocol*, String*) > +# > +CREATE TABLE `t1` ( > +`datas` VARCHAR(25) NOT NULL > +) ENGINE=InnoDB DEFAULT CHARSET=utf8; > +Warnings: > +Warning 1286 Unknown storage engine 'InnoDB' > +Warning 1266 Using storage engine MyISAM for table 't1' > +INSERT INTO `t1` VALUES ('1,2'), ('2,3'), ('3,4'); > +SELECT IF(FIND_IN_SET('1', `datas`), 1.5, IF(FIND_IN_SET('2', `datas`), 2, NULL)) AS `First`, '1' AS `Second`, '2' AS `Third` FROM `t1`; > +First Second Third > +1.5 1 2 > +2.0 1 2 > +NULL 1 2 > +drop table t1; > diff --git a/mysql-test/t/func_if.test b/mysql-test/t/func_if.test > index 2b89a61..8fdba77 100644 > --- a/mysql-test/t/func_if.test > +++ b/mysql-test/t/func_if.test > @@ -206,6 +206,20 @@ SELECT if(1, NULL, (SELECT min('hello'))); > > --echo End of 5.2 tests > > +--echo # > +--echo # MDEV-8663: IF Statement returns multiple values erroneously > +--echo # (or Assertion `!null_value' failed in Item::send(Protocol*, String*) > +--echo # > +CREATE TABLE `t1` ( > +`datas` VARCHAR(25) NOT NULL > +) ENGINE=InnoDB DEFAULT CHARSET=utf8; > + > +INSERT INTO `t1` VALUES ('1,2'), ('2,3'), ('3,4'); > + > +SELECT IF(FIND_IN_SET('1', `datas`), 1.5, IF(FIND_IN_SET('2', `datas`), 2, NULL)) AS `First`, '1' AS `Second`, '2' AS `Third` FROM `t1`; > + > +drop table t1; > + > --disable_query_log > # Restore timezone to default > set time_zone= @@global.time_zone; > diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc > index 998cb1c..4f07318 100644 > --- a/sql/item_cmpfunc.cc > +++ b/sql/item_cmpfunc.cc > @@ -2692,7 +2692,8 @@ Item_func_if::str_op(String *str) > String *res=arg->val_str(str); > if (res) > res->set_charset(collation.collation); > - null_value=arg->null_value; > + if (null_value=arg->null_value) > + res= NULL; > return res; > } > > @@ -2703,7 +2704,8 @@ Item_func_if::decimal_op(my_decimal *decimal_value) > DBUG_ASSERT(fixed == 1); > Item *arg= args[0]->val_bool() ? args[1] : args[2]; > my_decimal *value= arg->val_decimal(decimal_value); > - null_value= arg->null_value; > + if (null_value= arg->null_value) > + value= NULL; > return value; > } > > diff --git a/sql/item_func.cc b/sql/item_func.cc > index 2f51308..cbb8aa0 100644 > --- a/sql/item_func.cc > +++ b/sql/item_func.cc > @@ -924,6 +924,7 @@ String *Item_func_hybrid_result_type::val_str(String *str) > ltime.time_type= mysql_type_to_time_type(field_type()); > str->length(my_TIME_to_str(&ltime, const_cast<char*>(str->ptr()), decimals)); > str->set_charset(&my_charset_bin); > + DBUG_ASSERT(!null_value); > return str; > } > return str_op(&str_value); > @@ -932,6 +933,7 @@ String *Item_func_hybrid_result_type::val_str(String *str) > case IMPOSSIBLE_RESULT: > DBUG_ASSERT(0); > } > + DBUG_ASSERT(!null_value || (str == NULL)); > return str; > } > > @@ -1071,7 +1073,10 @@ my_decimal *Item_func_hybrid_result_type::val_decimal(my_decimal *decimal_value) > } > String *res; > if (!(res= str_op(&str_value))) > + { > + null_value= 1; > return NULL; > + } > > str2my_decimal(E_DEC_FATAL_ERROR, (char*) res->ptr(), > res->length(), res->charset(), decimal_value); > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits >

1 0

[Maria-developers] [GSoC] MDEV-4674 Port InnoDB memcached interface to MariaDB - Merging the code
by Piotr Jurkiewicz 02 Sep '15

02 Sep '15

Hi again, there are some issues which I think needs to be resolved before merging the code. 1. Bundle libevent or not? Memcached daemon is built with the help of libevent library. MySQL decided to bundle this library inside its sources, in 'libevent' top level directory. This allows to compile and run the plugin on machines without installed system-wide libevent library. The bundled libevent is used by default during the compilation of plugin. Optionally, it can be specified in CMake variable to use system-wide libevent instead. It needs to be decided whether MariaDB should bundle libevent as well inside its sources. Possible outcomes: a) Leave bundled libevent as is, in the 'libevent' top level directory. b) Move bundled libevent into the 'daemon_memcached' plugin directory, in order to not clutter the top level directory. c) Remove bundled libevent. After that, system libevent headers will become compile-time dependency and system libevent shared library runtime dependency of the plugin. 2. How to transfer InnoDB API callback array pointer to the plugin? InnoDB Memcached interface engine needs to obtain the pointer to InnoDB API callback array in some way. MySQL originally implemented that in 'sql/sql_plugin.cc:plugin_initialize()' in the following way: https://github.com/piotrjurkiewicz/mariadb-server/commit/4eb8fd9c211f396694… As you can see, this is not a clean solution. Possible outcomes: a) Leave the MySQL's solution as is. b) Figure out a better way to transfer the pointer. 3. Where should I post the documentation? 4. How should I prepare the pull request? Should I rebase my branch on the top of current branch before that? I looking forward for your suggestions and decisions. Piotr

2 1