- developers - lists.mariadb.org

Re: [Maria-developers] [Commits] ed5ec30: MDEV-7780 - Support for faking server version
by Sergei Golubchik 24 Dec '15

24 Dec '15

Hi, Sergey! On Dec 24, Sergey Vojtovich wrote: > revision-id: ed5ec30f9ca448086db5acbfd5f484a534119810 (mariadb-10.1.8-101-ged5ec30) > parent(s): 1f19c6aa93de730cd10c9fcbb337f9ec5c30ef9d > committer: Sergey Vojtovich > timestamp: 2015-12-24 15:46:18 +0400 > message: > > MDEV-7780 - Support for faking server version > > Embedded now supports "--version=<version>", while "--version" is still silently > ignored. Also only run protocol check in non-embedded mode. As I said on irc, I'd simply use not_embedded.inc, but ok, if you want it to work in embedded, sure, do it. One question below. > --- > mysql-test/suite/sys_vars/t/version.test | 3 ++- > sql/mysqld.cc | 4 ++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/mysql-test/suite/sys_vars/t/version.test b/mysql-test/suite/sys_vars/t/version.test > index 7955bf8..daa9538 100644 > --- a/mysql-test/suite/sys_vars/t/version.test > +++ b/mysql-test/suite/sys_vars/t/version.test > @@ -1,5 +1,6 @@ > SELECT @@version; > perl; > - $cnt= grep /my_favorite_version/, `$ENV{MYSQL} -e status`; > + $cnt= $ENV{MYSQL_TEST} =~ /mysqltest_embedded / ? 1 : > + grep /my_favorite_version/, `$ENV{MYSQL} -e status`; Why wouldn't you use mysql_embedded in this case? Like $mysql= $ENV{MYSQL_TEST} =~ /mysqltest_embedded / ? 'MYSQL_EMBEDDED' : 'MYSQL'; $cnt= grep /my_favorite_version/, `$ENV{$mysql} -e status`; > print "$cnt\n"; > EOF > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index 7360204..fa3a70f 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -8972,20 +8972,20 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument) > binlog_format_used= true; > break; > #include <sslopt-case.h> > -#ifndef EMBEDDED_LIBRARY > case 'V': > if (argument) > { > strmake(server_version, argument, sizeof(server_version) - 1); > set_sys_var_value_origin(&server_version_ptr, sys_var::CONFIG); > } > +#ifndef EMBEDDED_LIBRARY > else > { > print_version(); > opt_abort= 1; // Abort after parsing all options > } > - break; > #endif /*EMBEDDED_LIBRARY*/ > + break; > case 'W': > if (!argument) > global_system_variables.log_warnings++; Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

2 2

Re: [Maria-developers] [Commits] 370ab48: MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute paths
by Sergei Golubchik 22 Dec '15

22 Dec '15

Hi, Sergey! On Dec 18, Sergey Vojtovich wrote: > revision-id: 370ab48e9fcf4bc15ffa5e313fc34aa97981a832 (mariadb-10.1.9-24-g370ab48) > parent(s): 428e09a789a17211de9b4f0a2c4c1226d5dcf993 > committer: Sergey Vojtovich > timestamp: 2015-12-18 16:50:03 +0400 > message: > > MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute paths > > Allow absolute paths for INSTALL_*DIR. Okay, I agree now. Let's use your approach :) See below, one minor issue in mariadb.pc file. > diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt > index eb78016..54289c0 100644 > --- a/scripts/CMakeLists.txt > +++ b/scripts/CMakeLists.txt > > IF(UNIX) > CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh > ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) > - SET(DEST ${INSTALL_SCRIPTDIR}) > SET(EXT) you can remove EXT as well, it's apparently not used anymore. > EXECUTE_PROCESS( > COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db > diff --git a/support-files/mariadb.pc.in b/support-files/mariadb.pc.in > index bc84a5c..0605d86 100644 > --- a/support-files/mariadb.pc.in > +++ b/support-files/mariadb.pc.in > @@ -1,18 +1,18 @@ > # these four variables are present in almost every .pc file > prefix=@CMAKE_INSTALL_PREFIX@ > exec_prefix=${prefix} > -libdir=${prefix}/@INSTALL_LIBDIR@ > -includedir=${prefix}/@INSTALL_INCLUDEDIR@ > +libdir=@INSTALL_LIBDIRABS@ > +includedir=@INSTALL_INCLUDEDIRABS@ This is, strictly speaking, incorrect. In the old version one can change prefix to any other value and all other paths will auto-adjust. See: $ pkg-config --libs openrc -L/lib64 -lrc $ pkg-config --libs openrc --define-variable=prefix=/opt -L/opt/lib64 -lrc Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

2 2

Re: [Maria-developers] [Commits] daad482: MDEV-8615: Assertion `m_cpp_buf <= begin_ptr && begin_ptr <= m_cpp_buf + m_buf_length' failed in Lex_input_stream::body_utf8_start
by Sergei Golubchik 22 Dec '15

22 Dec '15

Hi, Sanja! On Dec 21, OleksandrByelkin wrote: > revision-id: daad4828b078485ee7ac60af4fc165ae35684395 (mariadb-10.1.9-21-gdaad482) > parent(s): 59fcd7ff2315d007045eb987da5f21abbea6f6f1 > committer: Oleksandr Byelkin > timestamp: 2015-12-21 20:13:12 +0100 > message: > > MDEV-8615: Assertion `m_cpp_buf <= begin_ptr && begin_ptr <= m_cpp_buf + m_buf_length' failed in Lex_input_stream::body_utf8_start > > If it is EOF then it may not be start of compound statement. > > --- > mysql-test/r/compound.result | 7 +++++++ > mysql-test/t/compound.test | 7 +++++++ > sql/sql_yacc.yy | 7 ++++++- > 3 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/mysql-test/r/compound.result b/mysql-test/r/compound.result > index 92d3226..1d412e6 100644 > --- a/mysql-test/r/compound.result > +++ b/mysql-test/r/compound.result > @@ -162,3 +162,10 @@ a > begin not atomic select a from t1 having a > 1; end| > a > drop table t1| > +# > +# MDEV-8615: Assertion `m_cpp_buf <= begin_ptr && > +# begin_ptr <= m_cpp_buf + m_buf_length' failed in > +# Lex_input_stream::body_utf8_start > +# > +b'| > +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 'b'' at line 1 > diff --git a/mysql-test/t/compound.test b/mysql-test/t/compound.test > index 1c5d12a..cabdf96 100644 > --- a/mysql-test/t/compound.test > +++ b/mysql-test/t/compound.test > @@ -150,3 +150,10 @@ select a from t1 having a > 1| > begin not atomic select a from t1 having a > 1; end| > drop table t1| > > +--echo # > +--echo # MDEV-8615: Assertion `m_cpp_buf <= begin_ptr && > +--echo # begin_ptr <= m_cpp_buf + m_buf_length' failed in > +--echo # Lex_input_stream::body_utf8_start > +--echo # > +--error ER_PARSE_ERROR > +--query b' > diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy > index a5a62ae..6611411 100644 > --- a/sql/sql_yacc.yy > +++ b/sql/sql_yacc.yy > @@ -237,6 +237,11 @@ static sp_head *make_sp_head(THD *thd, sp_name *name, > > static bool maybe_start_compound_statement(THD *thd) > { > + if (YYLIP->eof()) > + { > + my_parse_error(thd, ER_SYNTAX_ERROR); > + return 1; > + } no, I don't like that. Syntax errors should be issued by the parser, they should follow from the grammar, not be hard-coded in some explicit checks in the code. The problem in the current grammar - as I see it, that a code block is executed before any keyword is matched. This code block assumes it's the sp_unlabeled_control rule, while it could be anything. The fix would be to remove this code block and put this code after the first keyword is matched. > if (!thd->lex->sphead) > { > if (!make_sp_head(thd, NULL, TYPE_ENUM_PROCEDURE)) > @@ -4807,7 +4812,7 @@ create_body: > | opt_create_table_options opt_create_partitioning opt_create_select {} > /* > the following rule is redundant, but there's a shift/reduce > - conflict that prevents the rule above from parsing a syntax like > + conflict that prevents the rule above from parsing a synax like This is a strange change :) > CREATE TABLE t1 (SELECT 1); > */ Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

2 2

[Maria-developers] MDEV-8844 Unreadable control characters printed as is in warnings
by Alexander Barkov 22 Dec '15

22 Dec '15

Hi Sergei, Please review a patch for MDEV-8844. Thanks!

2 2

Re: [Maria-developers] [Commits] a030a28: MDEV-9095 - [PATCH] systemd capability for --memlock
by Sergei Golubchik 22 Dec '15

22 Dec '15

Hi, Sergey! On Dec 22, Sergey Vojtovich wrote: > revision-id: a030a2856bf39b9b9e743a09519b317e755b2833 (mariadb-10.1.9-26-ga030a28) > parent(s): fdce930ac6de9edfd53b851b542a4d07a95b3139 > committer: Sergey Vojtovich > timestamp: 2015-12-22 15:06:09 +0400 > message: > > MDEV-9095 - [PATCH] systemd capability for --memlock > > Adjust systemd files to enable CAP_IPC_LOCK to allow rootless mlockall > (triggered by memlock option). > > This is amended version of a patch originally submitted by Daniel Black. Ok to push. Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

Re: [Maria-developers] [Commits] 59fcd7f: MDEV-9118 ANALYZE TABLE for Engine independent status fetchs blob/text columns without use
by Sergey Petrunia 22 Dec '15

22 Dec '15

Hi Sanja, So, the patch produces warnings whenever a column is not collected. I think they should be produced only if the columns were explicitly specified in ANALYZE TABLE ... COLUMNS (col1, ...) syntax. The idea is that we should issue a warning when we're clearly not doing what the user has requested. ANALYZE TABLE .. PERSISTENT FOR ALL should not produce a warning. "ALL" here means "ALL that statsistics is can be collected for", so it is reasonable that the server will not collect statistics which it is unable to collect (e.g. blobs). Ok to push after this has been addressed. On Fri, Dec 18, 2015 at 12:23:45PM +0100, OleksandrByelkin wrote: > revision-id: 59fcd7ff2315d007045eb987da5f21abbea6f6f1 (mariadb-10.1.9-20-g59fcd7f) > parent(s): 953d5680a3c050273a8f29253f7386984679f92b > committer: Oleksandr Byelkin > timestamp: 2015-12-18 12:23:45 +0100 > message: > > MDEV-9118 ANALYZE TABLE for Engine independent status fetchs blob/text columns without use > > Do not include BLOB fields by default. > > --- > mysql-test/r/analyze.result | 2 + > mysql-test/r/mysqlcheck.result | 60 ++++++++++++++++++++----- > mysql-test/r/statistics.result | 26 ++++++++++- > mysql-test/r/statistics_index_crash-7362.result | 2 + > mysql-test/t/statistics.test | 11 +++++ > sql/share/errmsg-utf8.txt | 3 ++ > sql/sql_admin.cc | 31 ++++++++++--- > 7 files changed, 117 insertions(+), 18 deletions(-) > > diff --git a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result > index 9dff94a..5a05d1c 100644 > --- a/mysql-test/r/analyze.result > +++ b/mysql-test/r/analyze.result > @@ -34,9 +34,11 @@ create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_g > insert into t1 values ('hello'); > analyze table t1; > Table Op Msg_type Msg_text > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'a' > test.t1 analyze status OK > analyze table t1; > Table Op Msg_type Msg_text > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'a' > test.t1 analyze status Table is already up to date > drop table t1; > CREATE TABLE t1 (a int); > diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result > index 7d646dc..e69653f 100644 > --- a/mysql-test/r/mysqlcheck.result > +++ b/mysql-test/r/mysqlcheck.result > @@ -7,19 +7,34 @@ mtr.test_suppressions OK > mysql.column_stats OK > mysql.columns_priv OK > mysql.db OK > -mysql.event OK > +mysql.event > +Warning : Engine-independent statistics are not collected for column 'body' > +Warning : Engine-independent statistics are not collected for column 'body_utf8' > +status : OK > mysql.func OK > mysql.gtid_slave_pos OK > -mysql.help_category OK > +mysql.help_category > +Warning : Engine-independent statistics are not collected for column 'url' > +status : OK > mysql.help_keyword OK > mysql.help_relation OK > -mysql.help_topic OK > +mysql.help_topic > +Warning : Engine-independent statistics are not collected for column 'description' > +Warning : Engine-independent statistics are not collected for column 'example' > +Warning : Engine-independent statistics are not collected for column 'url' > +status : OK > mysql.host OK > mysql.index_stats OK > mysql.innodb_index_stats OK > mysql.innodb_table_stats OK > mysql.plugin OK > -mysql.proc OK > +mysql.proc > +Warning : Engine-independent statistics are not collected for column 'param_list' > +Warning : Engine-independent statistics are not collected for column 'returns' > +Warning : Engine-independent statistics are not collected for column 'body' > +Warning : Engine-independent statistics are not collected for column 'comment' > +Warning : Engine-independent statistics are not collected for column 'body_utf8' > +status : OK > mysql.procs_priv OK > mysql.proxies_priv OK > mysql.roles_mapping OK > @@ -31,7 +46,12 @@ mysql.time_zone_leap_second OK > mysql.time_zone_name OK > mysql.time_zone_transition OK > mysql.time_zone_transition_type OK > -mysql.user OK > +mysql.user > +Warning : Engine-independent statistics are not collected for column 'ssl_cipher' > +Warning : Engine-independent statistics are not collected for column 'x509_issuer' > +Warning : Engine-independent statistics are not collected for column 'x509_subject' > +Warning : Engine-independent statistics are not collected for column 'authentication_string' > +status : OK > mtr.global_suppressions Table is already up to date > mtr.test_suppressions Table is already up to date > mysql.column_stats OK > @@ -69,19 +89,34 @@ mysql.user OK > mysql.column_stats OK > mysql.columns_priv OK > mysql.db OK > -mysql.event OK > +mysql.event > +Warning : Engine-independent statistics are not collected for column 'body' > +Warning : Engine-independent statistics are not collected for column 'body_utf8' > +status : OK > mysql.func OK > mysql.gtid_slave_pos OK > -mysql.help_category OK > +mysql.help_category > +Warning : Engine-independent statistics are not collected for column 'url' > +status : OK > mysql.help_keyword OK > mysql.help_relation OK > -mysql.help_topic OK > +mysql.help_topic > +Warning : Engine-independent statistics are not collected for column 'description' > +Warning : Engine-independent statistics are not collected for column 'example' > +Warning : Engine-independent statistics are not collected for column 'url' > +status : OK > mysql.host OK > mysql.index_stats OK > mysql.innodb_index_stats OK > mysql.innodb_table_stats OK > mysql.plugin OK > -mysql.proc OK > +mysql.proc > +Warning : Engine-independent statistics are not collected for column 'param_list' > +Warning : Engine-independent statistics are not collected for column 'returns' > +Warning : Engine-independent statistics are not collected for column 'body' > +Warning : Engine-independent statistics are not collected for column 'comment' > +Warning : Engine-independent statistics are not collected for column 'body_utf8' > +status : OK > mysql.procs_priv OK > mysql.proxies_priv OK > mysql.roles_mapping OK > @@ -93,7 +128,12 @@ mysql.time_zone_leap_second OK > mysql.time_zone_name OK > mysql.time_zone_transition OK > mysql.time_zone_transition_type OK > -mysql.user OK > +mysql.user > +Warning : Engine-independent statistics are not collected for column 'ssl_cipher' > +Warning : Engine-independent statistics are not collected for column 'x509_issuer' > +Warning : Engine-independent statistics are not collected for column 'x509_subject' > +Warning : Engine-independent statistics are not collected for column 'authentication_string' > +status : OK > mysql.column_stats Table is already up to date > mysql.columns_priv Table is already up to date > mysql.db Table is already up to date > diff --git a/mysql-test/r/statistics.result b/mysql-test/r/statistics.result > index bd6a084..fdda572 100644 > --- a/mysql-test/r/statistics.result > +++ b/mysql-test/r/statistics.result > @@ -1212,6 +1212,7 @@ test t2 PRIMARY 1 1.0000 > ANALYZE TABLE t1; > Table Op Msg_type Msg_text > test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'b' > test.t1 analyze status OK > SELECT * FROM mysql.column_stats; > db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram > @@ -1225,7 +1226,6 @@ test t1 c aaaa dddddddd 0.1250 6.6571 7.0000 0 NULL NULL > test t1 d 1989-03-12 1999-07-23 0.1500 3.0000 8.5000 0 NULL NULL > test t1 e 0.01 0.112 0.2250 8.0000 6.2000 0 NULL NULL > test t1 f 1 5 0.2000 1.0000 6.4000 0 NULL NULL > -test t1 b NULL NULL 0.2000 17.1250 NULL NULL NULL NULL > SELECT * FROM mysql.index_stats; > db_name table_name index_name prefix_arity avg_frequency > test t1 idx2 1 7.0000 > @@ -1265,6 +1265,7 @@ set use_stat_tables='never'; > ANALYZE TABLE t1 PERSISTENT FOR ALL; > Table Op Msg_type Msg_text > test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'b' > test.t1 analyze status Table is already up to date > SELECT * FROM mysql.table_stats; > db_name table_name cardinality > @@ -1276,7 +1277,6 @@ test t1 c aaaa dddddddd 0.1250 6.6571 7.0000 0 NULL NULL > test t1 d 1989-03-12 1999-07-23 0.1500 3.0000 8.5000 0 NULL NULL > test t1 e 0.01 0.112 0.2250 8.0000 6.2000 0 NULL NULL > test t1 f 1 5 0.2000 1.0000 6.4000 0 NULL NULL > -test t1 b NULL NULL 0.2000 17.1250 NULL NULL NULL NULL > SELECT * FROM mysql.index_stats; > db_name table_name index_name prefix_arity avg_frequency > test t1 PRIMARY 1 1.0000 > @@ -1291,6 +1291,28 @@ test t1 idx4 3 NULL > DELETE FROM mysql.table_stats; > DELETE FROM mysql.column_stats; > DELETE FROM mysql.index_stats; > +ANALYZE TABLE t1 PERSISTENT FOR COLUMNS(b) INDEXES(); > +Table Op Msg_type Msg_text > +test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'b' > +test.t1 analyze status Table is already up to date > +ANALYZE TABLE t1 PERSISTENT FOR columns(a,b) INDEXES(); > +Table Op Msg_type Msg_text > +test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'b' > +test.t1 analyze status Table is already up to date > +ANALYZE TABLE t1 PERSISTENT FOR columns(b) indexes(idx2); > +Table Op Msg_type Msg_text > +test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'b' > +test.t1 analyze status Table is already up to date > +ANALYZE TABLE t1 PERSISTENT FOR columns() indexes(idx2); > +Table Op Msg_type Msg_text > +test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze status Table is already up to date > +DELETE FROM mysql.table_stats; > +DELETE FROM mysql.column_stats; > +DELETE FROM mysql.index_stats; > DROP TABLE t1,t2; > set names utf8; > CREATE DATABASE world; > diff --git a/mysql-test/r/statistics_index_crash-7362.result b/mysql-test/r/statistics_index_crash-7362.result > index 99f65d7..c213fa4 100644 > --- a/mysql-test/r/statistics_index_crash-7362.result > +++ b/mysql-test/r/statistics_index_crash-7362.result > @@ -3,6 +3,7 @@ INSERT INTO t1 VALUES (unhex('3E0D0A4141414142334E7A6143317963324541414141424977 > ANALYZE TABLE t1 PERSISTENT FOR ALL; > Table Op Msg_type Msg_text > test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'a' > test.t1 analyze status OK > SELECT * FROM mysql.index_stats WHERE index_name='a' AND table_name='t1'; > db_name table_name index_name prefix_arity avg_frequency > @@ -13,6 +14,7 @@ INSERT INTO t1 VALUES (unhex('3E0D0A4141414142334E7A6143317963324541414141424977 > ANALYZE TABLE t1 PERSISTENT FOR ALL; > Table Op Msg_type Msg_text > test.t1 analyze status Engine-independent statistics collected > +test.t1 analyze Warning Engine-independent statistics are not collected for column 'a' > test.t1 analyze status OK > SELECT * FROM mysql.index_stats WHERE index_name='a' AND table_name='t1'; > db_name table_name index_name prefix_arity avg_frequency > diff --git a/mysql-test/t/statistics.test b/mysql-test/t/statistics.test > index 2c8dec3..3b57b8f 100644 > --- a/mysql-test/t/statistics.test > +++ b/mysql-test/t/statistics.test > @@ -494,6 +494,17 @@ DELETE FROM mysql.table_stats; > DELETE FROM mysql.column_stats; > DELETE FROM mysql.index_stats; > > + > +ANALYZE TABLE t1 PERSISTENT FOR COLUMNS(b) INDEXES(); > +ANALYZE TABLE t1 PERSISTENT FOR columns(a,b) INDEXES(); > +ANALYZE TABLE t1 PERSISTENT FOR columns(b) indexes(idx2); > +ANALYZE TABLE t1 PERSISTENT FOR columns() indexes(idx2); > + > +DELETE FROM mysql.table_stats; > +DELETE FROM mysql.column_stats; > +DELETE FROM mysql.index_stats; > + > + > DROP TABLE t1,t2; > > set names utf8; > diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt > index 59908dc..178d1dd 100644 > --- a/sql/share/errmsg-utf8.txt > +++ b/sql/share/errmsg-utf8.txt > @@ -7136,3 +7136,6 @@ 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_NO_EIS_FOR_FIELD > + eng "Engine-independent statistics are not collected for column '%s'" > + ukr "Незалежна від типу таблиці статистика не збирається для стовбця '%s'" > diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc > index 0787aa9..d8ca863 100644 > --- a/sql/sql_admin.cc > +++ b/sql/sql_admin.cc > @@ -692,10 +692,20 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, > } > > if (!lex->column_list) > - { > - uint fields= 0; > - for ( ; *field_ptr; field_ptr++, fields++) ; > - bitmap_set_prefix(tab->read_set, fields); > + { > + bitmap_clear_all(tab->read_set); > + for (uint fields= 0; *field_ptr; field_ptr++, fields++) > + { > + enum enum_field_types type= (*field_ptr)->type(); > + if (type < MYSQL_TYPE_MEDIUM_BLOB || > + type > MYSQL_TYPE_BLOB) > + bitmap_set_bit(tab->read_set, fields); > + else > + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, > + ER_NO_EIS_FOR_FIELD, > + ER_THD(thd, ER_NO_EIS_FOR_FIELD), > + (*field_ptr)->field_name); > + } > } > else > { > @@ -713,8 +723,17 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, > compl_result_code= result_code= HA_ADMIN_INVALID; > break; > } > - bitmap_set_bit(tab->read_set, pos-1); > - } > + pos--; > + enum enum_field_types type= tab->field[pos]->type(); > + if (type < MYSQL_TYPE_MEDIUM_BLOB || > + type > MYSQL_TYPE_BLOB) > + bitmap_set_bit(tab->read_set, pos); > + else > + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, > + ER_NO_EIS_FOR_FIELD, > + ER_THD(thd, ER_NO_EIS_FOR_FIELD), > + column_name->str); > + } > tab->file->column_bitmaps_signal(); > } > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog

2 1

Re: [Maria-developers] [Commits] 063967b: MDEV-9081 - Debian: insecure debian-sys-maint password handling
by Sergei Golubchik 21 Dec '15

21 Dec '15

Hi, Sergey! On Dec 21, Sergey Vojtovich wrote: > revision-id: 063967b1e447f0fc908a1ec0224fd7c1d268bf17 (mariadb-10.1.9-25-g063967b) > parent(s): 370ab48e9fcf4bc15ffa5e313fc34aa97981a832 > committer: Sergey Vojtovich > timestamp: 2015-12-21 14:40:41 +0400 > message: > > MDEV-9081 - Debian: insecure debian-sys-maint password handling > > Set file permission before password is actually written. This is a quick fix > to close security gap. To be replaced by MDEV-8375 - passwordless root login. > > diff --git a/debian/mariadb-server-10.1.postinst b/debian/mariadb-server-10.1.postinst > index 0f35802..069c25e 100644 > --- a/debian/mariadb-server-10.1.postinst > +++ b/debian/mariadb-server-10.1.postinst > @@ -158,6 +158,8 @@ EOF > pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`; > if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi > cat /dev/null > $dc > + chown 0:0 $dc is that needed? (not that it hurts, but still...) > + chmod 0600 $dc ok. what about other issues you've mentioned in this MDEV-9081? besides, what the plan for moving to unix_socket auth? > echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc > echo "[client]" >>$dc > echo "host = localhost" >>$dc Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

2 5

Re: [Maria-developers] [Commits] 6414959: MDEV-7526: TokuDB doesn't build on OS X
by Sergei Golubchik 21 Dec '15

21 Dec '15

Hi, Vicentiu! On Dec 19, Vicentiu Ciorbaru wrote: > revision-id: 64149590c47d1cf6b1b227d8c90bdc23d20a8956 (mariadb-5.5.47-8-g6414959) > parent(s): f89c9fc4b7b5d82c79775cb848225900b45a6b79 > author: Vicențiu Ciorbaru > committer: Vicențiu Ciorbaru > timestamp: 2015-12-19 14:14:10 +0200 > message: > > MDEV-7526: TokuDB doesn't build on OS X > > This patch fixes another compilation error caused by specifying > attribute nonnull for all the parameters of the copyout function. This > is incorrect as the function actually gets called with null parameters > indirectly and thus only the output parameter should be nonnull. > > diff --git a/storage/tokudb/ft-index/util/dmt.h b/storage/tokudb/ft-index/util/dmt.h > index d4b032f..43e44df 100644 > --- a/storage/tokudb/ft-index/util/dmt.h > +++ b/storage/tokudb/ft-index/util/dmt.h > @@ -679,16 +679,16 @@ class dmt { > __attribute__((nonnull)) > void rebalance(subtree *const subtree); > > - __attribute__((nonnull)) > + __attribute__((nonnull(3))) > static void copyout(uint32_t *const outlen, dmtdata_t *const out, const dmt_node *const n); Where is copyout called with the null parameter? In 10.0 they've fixed it differently, it seems E.g. if (value != nullptr) { copyout(value, &this->d.a.values[best_zero]); } May be we'd better use the upstream fix? Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

3 3

Re: [Maria-developers] [Commits] ea741d9: MDEV-8627: SHOW GRANTS does not work for a replicated role
by Sergei Golubchik 20 Dec '15

20 Dec '15

Hi, Vicentiu! On Dec 19, Vicentiu Ciorbaru wrote: > revision-id: ea741d98566e95aa07ff94539dfc751c5b42dd44 (mariadb-10.1.9-24-gea741d9) > parent(s): 428e09a789a17211de9b4f0a2c4c1226d5dcf993 > author: Vicențiu Ciorbaru > committer: Vicențiu Ciorbaru > timestamp: 2015-12-19 00:35:14 +0200 > message: > > MDEV-8627: SHOW GRANTS does not work for a replicated role > > The bug was caused by accessing uninitialized fields within the LEX related to > ssl by mysql_show_grants() -> get_current_user() -> has_auth() function. ok to push Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

Re: [Maria-developers] [Commits] 591e74c: MDEV-7526: TokuDB doesn't build on OS X
by Sergei Golubchik 20 Dec '15

20 Dec '15

Hi, Vicentiu! On Dec 19, Vicentiu Ciorbaru wrote: > revision-id: 591e74c7e8f682f2eada7496f50aa73f38bd168d (mariadb-5.5.47-11-g591e74c) > parent(s): e386523a41245d8b03f1338934c1aa965530e4fc > author: DevilSatan > committer: Vicențiu Ciorbaru > timestamp: 2015-12-19 14:14:16 +0200 > message: > > MDEV-7526: TokuDB doesn't build on OS X > > A string definition is inconsistent and thus causes a compilation error. ok to push Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

Re: [Maria-developers] [Commits] e386523: MDEV-7526: TokuDB doesn't build on OS X
by Sergei Golubchik 20 Dec '15

20 Dec '15

Hi, Vicentiu! On Dec 19, Vicentiu Ciorbaru wrote: > revision-id: e386523a41245d8b03f1338934c1aa965530e4fc (mariadb-5.5.47-10-ge386523) > parent(s): f39b9e04db1e71e72bfc19174f257db5147df440 > author: Vicențiu Ciorbaru > committer: Vicențiu Ciorbaru > timestamp: 2015-12-19 14:14:16 +0200 > message: > > MDEV-7526: TokuDB doesn't build on OS X > > Fixed compile warning related to if statement always being true. The if > statement can not be false, as the address of a member field is always > true. ok to push Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

Re: [Maria-developers] [Commits] f39b9e0: MDEV-7526: TokuDB doesn't build on OS X
by Sergei Golubchik 20 Dec '15

20 Dec '15

Hi, Vicentiu! On Dec 19, Vicentiu Ciorbaru wrote: > revision-id: f39b9e04db1e71e72bfc19174f257db5147df440 (mariadb-5.5.47-9-gf39b9e0) > parent(s): 64149590c47d1cf6b1b227d8c90bdc23d20a8956 > author: Vicențiu Ciorbaru > committer: Vicențiu Ciorbaru > timestamp: 2015-12-19 14:14:16 +0200 > message: > > MDEV-7526: TokuDB doesn't build on OS X > > Removed unused functions from tokudb_dump.cc. ok to push Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

Re: [Maria-developers] [Commits] f89c9fc: MDEV-7526: TokuDB doesn't build on OS X
by Sergei Golubchik 20 Dec '15

20 Dec '15

Hi, Vicentiu! On Dec 19, Vicentiu Ciorbaru wrote: > revision-id: f89c9fc4b7b5d82c79775cb848225900b45a6b79 (mariadb-5.5.47-7-gf89c9fc) > parent(s): 0ed474484c037a32bea32abaecd3ff770f40bd49 > author: Vicențiu Ciorbaru > committer: Vicențiu Ciorbaru > timestamp: 2015-12-19 14:14:05 +0200 > message: > > MDEV-7526: TokuDB doesn't build on OS X > > This patch fixes one compilation error related to __db_lsn struct. The > struct can not be defined as empty according to the main C standard. > In C++, this is handled by forcing a size of 1. To eliminate the error > we add a dummy char field of size 1. This has no effect on the C++ > compiled code, but also removes the compiler error. > > --- > storage/tokudb/ft-index/buildheader/make_tdb.cc | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/storage/tokudb/ft-index/buildheader/make_tdb.cc b/storage/tokudb/ft-index/buildheader/make_tdb.cc > index 5370664..610ce67 100644 > --- a/storage/tokudb/ft-index/buildheader/make_tdb.cc > +++ b/storage/tokudb/ft-index/buildheader/make_tdb.cc > @@ -481,7 +481,9 @@ static void print_db_key_range_struct (void) { > > static void print_db_lsn_struct (void) { > field_counter=0; > - sort_and_dump_fields("db_lsn", false, NULL); > + /* A dummy field to make sizeof(DB_LSN) equal in C and C++ */ > + const char *extra[] = { "char dummy", NULL }; > + sort_and_dump_fields("db_lsn", false, extra); > } seems like a backport from 10.0. ok to push Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

[Maria-developers] MDEV-9181 (NULLIF(table.col)0) gives wrong result on 10.1.x
by Alexander Barkov 18 Dec '15

18 Dec '15

Hi Sergei, Please find a prototype patch for MDEV-9181 attached. It works, but I'm not fully sure. Any better ideas? Thanks.

1 0

[Maria-developers] New mariadb.org in the works
by Otto Kekäläinen 18 Dec '15

18 Dec '15

Hello! We are about to renew the mariadb.org website. The idea is to replace the current mariadb.org and blog.mariadb.org with one single site that includes both the basic information about the software project and the MariaDB Foundation, as well as the blog. Work in progress is visible at https://new.mariadb.org/ Please send us your feedback!

1 1

[Maria-developers] Unsubscribe
by Abdul Hakeem 17 Dec '15

17 Dec '15

2 1

Re: [Maria-developers] [Commits] 732d45e: MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in many
by Sergei Golubchik 16 Dec '15

16 Dec '15

Hi, Sergey! On Dec 14, Sergey Vojtovich wrote: > revision-id: 732d45e93b81a104e3f3931e4908e22167a54622 (mariadb-10.0.22-57-g732d45e) > parent(s): 3e206a518dec400e084451165f633b78eb2e7fee > committer: Sergey Vojtovich > timestamp: 2015-12-14 15:27:09 +0400 > message: > > MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in many > of the plugins > > Fixed exit/_exit calls from libdaemon_example.so, libmysqlclient.so, > libmysqlclient_r.so, libmysqld.so. > > Note: this is just rough prototype, not to be pushed. libmysqld.so still has > a bunch of exit/_exit calls from InnoDB. > > diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c > index 90e6f43..276d5aa 100644 > --- a/mysys/my_addr_resolve.c > +++ b/mysys/my_addr_resolve.c > @@ -190,7 +190,7 @@ const char *my_addr_resolve_init() > close(out[0]); > close(out[1]); > execlp("addr2line", "addr2line", "-C", "-f", "-e", my_progname, NULL); > - exit(1); > + abort(); ok > } > > close(in[0]); > diff --git a/mysys/my_default.c b/mysys/my_default.c > index 8faee00..7bf86f2 100644 > --- a/mysys/my_default.c > +++ b/mysys/my_default.c > @@ -631,7 +631,7 @@ int my_load_defaults(const char *conf_file, const char **groups, > if (!my_getopt_is_args_separator((*argv)[i])) /* skip arguments separator */ > printf("%s ", (*argv)[i]); > puts(""); > - exit(0); > + abort(); /* !!! */ not ok. --print-defaults means exit(0), not abort() > } > > if (default_directories) > @@ -641,7 +641,7 @@ int my_load_defaults(const char *conf_file, const char **groups, > > err: > fprintf(stderr,"Fatal error in defaults handling. Program aborted\n"); > - exit(1); > + abort(); ok > return 0; /* Keep compiler happy */ > } > > diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c > index e5332301..111bc7f 100644 > --- a/mysys/my_malloc.c > +++ b/mysys/my_malloc.c > @@ -108,7 +108,7 @@ void *my_malloc(size_t size, myf my_flags) > my_error(EE_OUTOFMEMORY, MYF(ME_BELL + ME_WAITTANG + > ME_NOREFRESH + ME_FATALERROR),size); > if (my_flags & MY_FAE) > - exit(1); > + abort(); no, MY_FAE means exit(1) not abort() > } > else > { > diff --git a/mysys/my_static.c b/mysys/my_static.c > index 84d2dc6..4272c24 100644 > --- a/mysys/my_static.c > +++ b/mysys/my_static.c > @@ -72,7 +72,8 @@ ulong my_time_to_wait_for_lock=2; /* In seconds */ > #ifdef SHARED_LIBRARY > const char *globerrs[GLOBERRS]; /* my_error_messages is here */ > #endif > -void (*my_abort_hook)(int) = (void(*)(int)) exit; > +void my_abort_wrapper(int a __attribute__((unused))) { abort(); } > +void (*my_abort_hook)(int)= my_abort_wrapper; whatever, it's never used, as far as I can see. It can as well be removed. > void (*error_handler_hook)(uint error, const char *str, myf MyFlags)= > my_message_stderr; > void (*fatal_error_handler_hook)(uint error, const char *str, myf MyFlags)= > diff --git a/mysys/typelib.c b/mysys/typelib.c > index 75744a6..ec1e8fb 100644 > --- a/mysys/typelib.c > +++ b/mysys/typelib.c > @@ -51,7 +51,7 @@ int find_type_or_exit(const char *x, TYPELIB *typelib, const char *option) > if ((res= find_type_with_warning(x, typelib, option)) <= 0) > { > sf_leaking_memory= 1; /* no memory leak reports here */ > - exit(1); > + abort(); no, it's find_type_or_exit, not find_type_or_abort. Incorrect option on the command line should not cause SIGABRT. > } > return res; > } > diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc > index dbc3c5c..cdea632 100644 > --- a/plugin/daemon_example/daemon_example.cc > +++ b/plugin/daemon_example/daemon_example.cc > @@ -129,7 +129,7 @@ static int daemon_example_plugin_init(void *p __attribute__ ((unused))) > (void *)con) != 0) > { > fprintf(stderr,"Could not create heartbeat thread!\n"); > - exit(0); > + DBUG_RETURN(1); ok > } > plugin->data= (void *)con; > > diff --git a/sql-common/client.c b/sql-common/client.c > index d20759c..7a4efc3 100644 > --- a/sql-common/client.c > +++ b/sql-common/client.c > @@ -1219,7 +1219,7 @@ void mysql_read_default_options(struct st_mysql_options *options, > FIND_TYPE_BASIC)) <= 0) > { > fprintf(stderr, "Unknown option to protocol: %s\n", opt_arg); > - exit(1); > + abort(); No way. An application should not SIGABRT on the invalid values in the my.cnf file. It should not exit either, in fact, but it's a different issue. > } > break; > case OPT_shared_memory_base_name: > diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc > index 3fadbcd..b301b4c 100644 > --- a/sql/signal_handler.cc > +++ b/sql/signal_handler.cc > @@ -69,7 +69,7 @@ extern "C" sig_handler handle_fatal_signal(int sig) > if (segfaulted) > { > my_safe_printf_stderr("Fatal " SIGNAL_FMT " while backtracing\n", sig); > - _exit(1); /* Quit without running destructors */ > + abort(); Heh, no. You don't want to send another signal when you've encountered an fatal error inside the signal handler. ... etc ... Are you sure we want to fix that at all? And if yes - is it something we need to bother fixing now? How comes it's "critical"? Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

2 2

Re: [Maria-developers] [Commits] 0b0d341: MDEV-9044 : Binlog corruption in Galera
by Sergei Golubchik 16 Dec '15

16 Dec '15

Hi, Nirbhay! On Dec 07, Nirbhay Choubey wrote: > revision-id: 0b0d34138300b891ccbec58e01f3ab5bebe24d71 > parent(s): 3c0e9d31b3e6494931deb09f5c93b05a96df8471 > committer: Nirbhay Choubey > branch nick: 10.1.b9044 > timestamp: 2015-12-07 14:01:52 -0500 > message: > > MDEV-9044 : Binlog corruption in Galera > > While refreshing the IO_CACHE, do not update its parameters (read_pos, > read_end & pos_in_file) if there is nothing left to read. I'm sorry, but I don't understand the fix. Why should parameters be not updated? If there's nothing left to read, the cache is marked as empty, that seems to be correct. > diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c > index 28e5e72..db8d0b5 100644 > --- a/mysys/mf_iocache.c > +++ b/mysys/mf_iocache.c > @@ -663,7 +663,11 @@ int _my_b_cache_read(IO_CACHE *info, uchar *Buffer, size_t Count) > info->error= (int) left_length; > DBUG_RETURN(1); > } > - length=0; /* Didn't read any chars */ > + else > + { > + info->error= 0; > + DBUG_RETURN(0); /* EOF */ > + } > } Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

Re: [Maria-developers] [Commits] 9d8ad0d: Add --persistent option for mysqlcheck
by Sergey Vojtovich 15 Dec '15

15 Dec '15

Hi Vicentu, this is contribution by Daniel. He should get some credit for this. Assuming you didn't change this code much, this should be committed on Daniel's behalf, so that he gets credit on github. Or at the very least mention in a comment contribution author. Thanks, Sergey On Tue, Dec 15, 2015 at 11:11:50AM +0200, Vicentiu Ciorbaru wrote: > revision-id: 9d8ad0d79e3c3a1a9bf7c8cc6477ee4e69fba633 (mariadb-10.0.22-63-g9d8ad0d) > parent(s): e9b4a041af5122dffd59012493c565e6e3db2664 > committer: Vicențiu Ciorbaru > timestamp: 2015-12-15 11:11:28 +0200 > message: > > Add --persistent option for mysqlcheck > > 10.0 has an "analyze table .. persistent for all" syntax. This adds > --persistent to mysqlcheck(mysqlanalyize) to perform this extended > analyze table option. > > --- > client/mysqlcheck.c | 6 +++++- > man/mysqlcheck.1 | 18 +++++++++++++++++- > 2 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c > index ead4127..b9e5478 100644 > --- a/client/mysqlcheck.c > +++ b/client/mysqlcheck.c > @@ -43,7 +43,7 @@ static my_bool opt_alldbs = 0, opt_check_only_changed = 0, opt_extended = 0, > opt_silent = 0, opt_auto_repair = 0, ignore_errors = 0, > tty_password= 0, opt_frm= 0, debug_info_flag= 0, debug_check_flag= 0, > opt_fix_table_names= 0, opt_fix_db_names= 0, opt_upgrade= 0, > - opt_do_tables= 1; > + opt_persistent_all= 0, opt_do_tables= 1; > static my_bool opt_write_binlog= 1, opt_flush_tables= 0; > static uint verbose = 0, opt_mysql_port=0; > static int my_end_arg; > @@ -160,6 +160,9 @@ static struct my_option my_long_options[] = > {"password", 'p', > "Password to use when connecting to server. If password is not given, it's solicited on the tty.", > 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, > + {"persistent", 'Z', "When using ANALYZE TABLE use the PERSISTENT FOR ALL option.", > + &opt_persistent_all, &opt_persistent_all, 0, GET_BOOL, NO_ARG, 0, 0, > + 0, 0, 0, 0}, > #ifdef __WIN__ > {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG, > NO_ARG, 0, 0, 0, 0, 0, 0}, > @@ -909,6 +912,7 @@ static int handle_request_for_tables(char *tables, size_t length, my_bool view) > case DO_ANALYZE: > DBUG_ASSERT(!view); > op= (opt_write_binlog) ? "ANALYZE" : "ANALYZE NO_WRITE_TO_BINLOG"; > + if (opt_persistent_all) end = strmov(end, " PERSISTENT FOR ALL"); > break; > case DO_OPTIMIZE: > DBUG_ASSERT(!view); > diff --git a/man/mysqlcheck.1 b/man/mysqlcheck.1 > index c175483..e05bbf8 100644 > --- a/man/mysqlcheck.1 > +++ b/man/mysqlcheck.1 > @@ -1,6 +1,6 @@ > '\" t > .\" > -.TH "\FBMYSQLCHECK\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System" > +.TH "\FBMYSQLCHECK\FR" "1" "27/12/2015" "MariaDB 10\&.0" "MariaDB Database System" > .\" ----------------------------------------------------------------- > .\" * set default formatting > .\" ----------------------------------------------------------------- > @@ -677,6 +677,22 @@ Specifying a password on the command line should be considered insecure\&. You c > .sp -1 > .IP \(bu 2.3 > .\} > +.\" mysqlcheck: persisent option > +.\" persistent option: mysql > +\fB\-\-persistent\fR, > +\fB\-Z\fR > +.sp > +Used with ANALYZE TABLE to append the option PERSISENT FOR ALL. > +.RE > +.sp > +.RS 4 > +.ie n \{\ > +\h'-04'\(bu\h'+03'\c > +.\} > +.el \{\ > +.sp -1 > +.IP \(bu 2.3 > +.\} > .\" mysqlcheck: pipe option > .\" pipe option: mysql > \fB\-\-pipe\fR, > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

2 2

[Maria-developers] MDEV-8721 AIX: Compile error xtradb:log0log.cc
by Alexander Barkov 15 Dec '15

15 Dec '15

Hi Jan, Can you please review a patch for: MDEV-8721 AIX: Compile error xtradb:log0log.cc which seems to be the same bug with: MDEV-8516 AIX xtradb -> log -> log0log.cc.o Note, I don't have an AIX 7 machine. Just applying the fix suggested by the complainer. The fix looks fine for me. Thanks.

1 0

[Maria-developers] gsoc 2016 and Contributing to MariaDB
by Malith Jayaweera 13 Dec '15

13 Dec '15

Hi! I'm a student and am very much interested in contributing to Maria db. I'm new to development and I haven't got a clue as to where to start. Any sort of guidance is highly appreciated. Thanks. Malith

1 0

[Maria-developers] Please review MDEV-7055 MySQL#74664 - InnoDB: Failing assertion ...
by Alexander Barkov 11 Dec '15

11 Dec '15

Hi Sergei, Please review a patch for MDEV-7055. Thanks.

2 2

[Maria-developers] BUILD ERROR
by Laketra Musa 11 Dec '15

11 Dec '15

Hi, I was Building mariadb on Mac OS X and got this error: [ 81%] Built target pfs_misc-t [ 81%] Built target pfs_timer-t [ 81%] Built target pfs_user-oom-t [ 81%] Built target sphinx [ 83%] Built target spider [ 83%] Built target test_sql_discovery [ 84%] Built target tokuportability_static_conv [ 84%] Built target tokuportability_static [ 84%] Built target logformat [ 84%] Built target generate_log_code [ 84%] Built target make_tdb [ 84%] Built target install_tdb_h [ 84%] Building CXX object storage/tokudb/ft-index/src/CMakeFiles/tokudb_static_conv.dir/ydb.cc.o In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/src/ydb.cc:97: /Users/osiris/Desktop/server/build/storage/tokudb/ft-index/buildheader/db.h:323:1: error: empty struct has size 0 in C, size 1 in C++ [-Werror,-Wextern-c-compat] struct __toku_db_lsn { ^ In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/src/ydb.cc:107: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/ft-flusher.h:94: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/ft-internal.h:103: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/node.h:91: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/bndata.h:93: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.h:731: /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:925:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:935:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:945:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:955:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ 5 errors generated. make[2]: *** [storage/tokudb/ft-index/src/CMakeFiles/tokudb_static_conv.dir/ydb.cc.o] Error 1 make[1]: *** [storage/tokudb/ft-index/src/CMakeFiles/tokudb_static_conv.dir/all] Error 2 make: *** [all] Error 2 How can I fix this please?

3 2

[Maria-developers] PR#129 - 'truncate table' make server crash in sharding&ha configuration when wrapper is oracle
by Sergey Vojtovich 10 Dec '15

10 Dec '15

Hi Kentoku, we got new pull request for Spider. Could you suggest what should we do about it? What license should be requested for Spider contributions? PR: https://github.com/MariaDB/server/pull/129 MDEV: https://mariadb.atlassian.net/browse/MDEV-9254 Thanks, Sergey

1 0

Re: [Maria-developers] [Commits] 6c19f0b: MDEV-9172 - Analyze patches for IBM System z
by Sergei Golubchik 09 Dec '15

09 Dec '15

Hi, Sergey! On Nov 27, Sergey Vojtovich wrote: > revision-id: 6c19f0b0eb0600c276f8681673dc768d542d3bd3 (mariadb-10.1.9-8-g6c19f0b) > parent(s): 3c0e9d31b3e6494931deb09f5c93b05a96df8471 > committer: Sergey Vojtovich > timestamp: 2015-11-27 13:58:30 +0400 > message: > > MDEV-9172 - Analyze patches for IBM System z > > Extended my_timer_cycles() to support s390. > Some compiler tunings for RHEL/SLES RPM packages on s390. > > diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake > index 8c79ec2..75ce57e 100644 > --- a/cmake/build_configurations/mysql_release.cmake > +++ b/cmake/build_configurations/mysql_release.cmake > @@ -154,6 +154,25 @@ IF(UNIX) > SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") > ENDIF() > > + # IBM Z flags > + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") > + IF(RPM MATCHES "(rhel|centos)6" OR RPM MATCHES "(suse|sles)11") > + SET(z_flags "-funroll-loops -march=z9-109 -mtune=z10 ") > + ELSEIF(RPM MATCHES "(rhel|centos)7" OR RPM MATCHES "(suse|sles)12") > + SET(z_flags "-funroll-loops -march=z196 -mtune=zEC12 ") > + ELSE() > + SET(z_flags "") > + ENDIF() Does MariaDB compile and work without these flags? > diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c > index 82e5609..4228973 100644 > --- a/mysys/my_rdtsc.c > +++ b/mysys/my_rdtsc.c > @@ -249,6 +249,13 @@ ulonglong my_timer_cycles(void) > clock_gettime(CLOCK_SGI_CYCLE, &tp); > return (ulonglong) tp.tv_sec * 1000000000 + (ulonglong) tp.tv_nsec; > } > +#elif defined(__GNUC__) && defined(__s390__) > + /* covers both s390 and s390x */ > + { > + ulonglong result; > + __asm__ __volatile__ ("stck %0" : "=Q" (result) : : "cc"); I cannot really review that :) If you've checked the documentation and tested it and whatever, then let's push it. > + return result; > + } > #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

2 1

[Maria-developers] Unsubscribe
by Abdul Hakeem 06 Dec '15

06 Dec '15

1 0

Re: [Maria-developers] [Commits] bde705f: MDEV-7050: MySQL#74603 - Assertion `comma_length > 0' failed in mysql_prepare_create_table
by Sergei Golubchik 06 Dec '15

06 Dec '15

Hi, Jan! On Dec 02, Jan Lindström wrote: > revision-id: bde705fdaec49ab495eafcd18c609970a2566cb7 (mariadb-5.5.46-10-gbde705f) > parent(s): 13ad179c96ee8c8c4043806b8575c851e3676f0d > committer: Jan Lindström > timestamp: 2015-12-02 17:53:28 +0200 > message: > > MDEV-7050: MySQL#74603 - Assertion `comma_length > 0' failed in mysql_prepare_create_table > > Too short buffer was used for ENUM comma buffer. > > --- > mysql-test/r/create.result | 20 ++++++++++++++++++++ > mysql-test/t/create.test | 21 +++++++++++++++++++++ > sql/sql_table.cc | 2 +- > 3 files changed, 42 insertions(+), 1 deletion(-) > > diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result > index 8dd3cc8..2da3460 100644 > --- a/mysql-test/r/create.result > +++ b/mysql-test/r/create.result > @@ -2477,3 +2477,23 @@ t1 CREATE TABLE `t1` ( > `c` char(32) AS (convert(cast(n as char), char)) PERSISTENT > ) ENGINE=MyISAM DEFAULT CHARSET=latin1 > drop table t1; > +DROP DATABASE test; > +CREATE DATABASE test; > +USE test; > +SET character_set_filesystem=filename; > +SET @session_start_value=@@character_set_filesystem; > +SET @@session.collation_server=@session_start_value; > +create table t0(a ENUM('','')); > +Warnings: > +Note 1291 Column 'a' has duplicated value '' in ENUM > +DROP DATABASE test; > +CREATE DATABASE test; > +USE test; > +create table t0(a ENUM('','')); > +Warnings: > +Note 1291 Column 'a' has duplicated value '' in ENUM > +DROP TABLE t0; > +SET @@session.collation_server = latin1_swedish_ci; > +DROP DATABASE test; > +CREATE DATABASE test; > +USE test; You could do with a simpler test case. This one worked for me: set @@session.collation_server=filename; create table t1(a enum('','')); drop table t1; set @@session.collation_server=default; > diff --git a/sql/sql_table.cc b/sql/sql_table.cc > index 6e589e2..6ce46ad 100644 > --- a/sql/sql_table.cc > +++ b/sql/sql_table.cc > @@ -2986,7 +2986,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, > sql_field->interval_list); > List_iterator<String> int_it(sql_field->interval_list); > String conv, *tmp; > - char comma_buf[4]; /* 4 bytes for utf32 */ > + char comma_buf[8]; /* 4*2 bytes for utf32 */ incorrect comment, must be char comma_buf[5]; /* 5 bytes for 'filename' charset */ and please, add an assert: DBUG_ASSERT(sizeof(comma_buf) >= cs->mbmaxlen); > int comma_length= cs->cset->wc_mb(cs, ',', (uchar*) comma_buf, > (uchar*) comma_buf + > sizeof(comma_buf)); There's another bug, while 5 and the assert might not be working for you. I'll attach the patch with the fix. Feel free to push it, it must be pushed before your bugfix. Or wait for me to, as you like. Just tell me what you choose. Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

[Maria-developers] Error Compiling MariaDB with clang on Mac Os X
by Vicențiu Ciorbaru 04 Dec '15

04 Dec '15

Hi Sergei, While working on features for 10.2 I've encountered a problem when compiling MariaDB as a Debug build. According to your change on commit 29dd634a4c0b9c3579cf9d318ed64d748d848b1d dbug: correct trace for DBUG_RETURN(func()); This causes a small problem, in two places within the codebase. One is in the myisam storage engine and one in the maria storage engine. Within thr_find_all_keys, there is a hack with goto statements and using DBUG_ENTER after my_thread_init(). /Users/cvicentiu/Workspace/MariaDB/storage/myisam/sort.c:352:5: error: cannot jump from this goto statement to its label goto err; ^ /Users/cvicentiu/Workspace/MariaDB/storage/myisam/sort.c:355:5: note: jump bypasses initialization of variable with __attribute__((cleanup)) DBUG_ENTER("thr_find_all_keys"); ^ /Users/cvicentiu/Workspace/MariaDB/include/my_dbug.h:74:47: note: expanded from macro 'DBUG_ENTER' #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_ __attribute__((cleanup(_db_return_))); \ In the current code state, the attribute_cleanup callback does not make sense if my_thread_init() fails and forces the goto err; Technically, it is undefined behaviour, as we're jumping within the block that has the variables defined, without initialising it. The sensible thing to do is to refactor the block that has DBUG_ENTER into a separate function and decoupling the error cleanup from the my_thread_init() call. I've looked at that code and have seen that much of the logic is redundant during the cleanup part. I can refactor it to fix the problem, but I'm looking for input on your side if you're ok with me doing that. I've also found a bug in that same code in the error checking that I can fix. Regards, Vicentiu

2 1

[Maria-developers] [MDEV-7122] Questions regarding code history
by Vicențiu Ciorbaru 04 Dec '15

04 Dec '15

Hi Sergey! I've been investigating MDEV-7122. I'm still quite a ways to go before I can understand all the underlying bits of logic. I need a little help regarding a change that you've committed a while back. Do you know (remember) why you've placed DBUG_ASSERT(0) in the commit: a1b4eadf89a3940b80a6ed0eadd15ba456c2fa7a BUG#868908: Crash in check_simple_equality() with semijoin + materialization + prepared statement - Part2: safety and code cleanup To me, it feels like it's some leftover debugging code, but it would be good to get your input on this. @@ -4182,6 +4183,8 @@ bool subselect_hash_sj_engine::init(List<Item> *tmp_columns, uint subquery_id) */ if (tmp_table->s->keys == 0) { + //fprintf(stderr, "Q: %s\n", current_thd->query()); + DBUG_ASSERT(0); Obviously we should also get rid of the commented fprintf statement. After trying to debug this by just looking at the adjacent function calls and logic, I've come to the conclusion that I need to actually understand the code methodically. This is what I am actually doing right now, starting from the parser, all the way to how this particular query is executed. Expect more questions from me on this topic. Thanks, Vicentiu

1 0

[Maria-developers] The compile errors on Linux on Power
by Lixun Peng 04 Dec '15

04 Dec '15

Hi everyone, Recently I want to test MariaDB 10.1.9 on Linux on Power8. *But GCC will report following errors:* [ 52%] Building CXX object > storage/innobase/CMakeFiles/innobase.dir/api/api0api.cc.o > In file included from > /root/mariadb-10.1.9/storage/innobase/include/ut0ut.h:36, > from > /root/mariadb-10.1.9/storage/innobase/include/univ.i:636, > from > /root/mariadb-10.1.9/storage/innobase/api/api0api.cc:27: > /root/mariadb-10.1.9/storage/innobase/include/os0sync.h:521:4: error: > #error "Unsupported platform" > [ 52%] Building CXX object > storage/archive/CMakeFiles/archive.dir/ha_archive.cc.o > In file included from > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.h:837, > from > /root/mariadb-10.1.9/storage/innobase/include/mem0mem.h:34, > from > /root/mariadb-10.1.9/storage/innobase/include/data0data.h:33, > from > /root/mariadb-10.1.9/storage/innobase/include/que0que.h:30, > from > /root/mariadb-10.1.9/storage/innobase/include/api0misc.h:32, > from > /root/mariadb-10.1.9/storage/innobase/api/api0api.cc:38: > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic: In function > ‘lock_word_t ib_mutex_test_and_set(ib_mutex_t*)’: > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic:85: error: > ‘os_atomic_test_and_set’ was not declared in this scope > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic: In function > ‘void mutex_reset_lock_word(ib_mutex_t*)’: > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic:113: error: > ‘os_atomic_clear’ was not declared in this scope > make[2]: *** [storage/innobase/CMakeFiles/innobase.dir/api/api0api.cc.o] > Error 1 > make[1]: *** [storage/innobase/CMakeFiles/innobase.dir/all] Error 2 > make[1]: *** Waiting for unfinished jobs.... I found the problem is: *storage/innobase/include/sync0sync.ic* > ib_mutex_test_and_set( > /*==================*/ > ib_mutex_t* mutex) /*!< in: mutex */ > { > #if defined(HAVE_ATOMIC_BUILTINS) > return(os_atomic_test_and_set(&mutex->lock_word)); > #else *storage/innobase/include/os0sync.h* > #if defined(__powerpc__) || defined(__aarch64__) > /* > os_atomic_test_and_set_byte_release() should imply a release barrier > before > setting, and a full barrier after. But __sync_lock_test_and_set() is only > documented as an aquire barrier. So on PowerPC we need to add the full > barrier explicitly. */ > # define os_atomic_test_and_set_byte_release(ptr, new_val) \ > do { __sync_lock_release(ptr); \ > __sync_synchronize(); } while (0) > #else Only HAVE_IB_GCC_ATOMIC_TEST_AND_SET or IB_STRONG_MEMORY_MODEL will enable codes about os_atomic_test_and_set() and os_atomic_clear(). But on my Power8 environment, HAVE_ATOMIC_BUILTINS is defined, HAVE_IB_GCC_ATOMIC_TEST_AND_SET and IB_STRONG_MEMORY_MODEL are not defined. So in sync0sync.ic, os_atomic_test_and_set() is used, but in os0sync.h, os_atomic_test_and_set() is not defined. Does anybody know how to solve this problem? I'm not familiar with Power. Thanks, Lixun -- Staff Database Engineer @ Alibaba Cloud Computing Oracle ACE for MySQL Phone: +86 18658156856 (Hangzhou) Blog: http://www.penglixun.com

2 2

[Maria-developers] Voting for some MariaDB Server related submissions for Percona Live
by Colin Charles 03 Dec '15

03 Dec '15

Hi all, It turns out that what is considered to be the largest conference for those interested in the MySQL world, nowadays called the Percona Live Data Performance Conference, is requiring the community to vote on submissions that they would like to hear. Only after voting, will those with a certain threshold (not published) be sent to the next level for the program committee to vote on. Its clear that you *do not* have to be attending the event, but you do need to register to vote. I’m sure all of us would appreciate your votes. The people below offering talks are Sergei Golubchik, Sergei Petrunia, Michael “Monty” Widenius, Gerry Narvaja, Serge Frezefond, Anders Karlsson, and me, Colin Charles. Thanking you all in advance! cheers, -colin Using and Managing MariaDB https://www.percona.com/live/data-performance-conference-2016/sessions/comp… MariaDB 10.1 - What's New? (*** includes Monty himself! ***) https://www.percona.com/live/data-performance-conference-2016/sessions/mari… Databases in the Hosted Cloud https://www.percona.com/live/data-performance-conference-2016/sessions/data… Best Practices for MySQL High Availability https://www.percona.com/live/data-performance-conference-2016/sessions/best… Choosing a MySQL HA solution today https://www.percona.com/live/data-performance-conference-2016/sessions/choo… MariaDB/MySQL security essentials https://www.percona.com/live/data-performance-conference-2016/sessions/mari… The MySQL Server Ecosystem in 2016 https://www.percona.com/live/data-performance-conference-2016/sessions/mysq… MariaDB Connectors: Fast and Smart with the new protocol optimizations https://www.percona.com/live/data-performance-conference-2016/sessions/mari… MariaDB 10.1 Security: Validation, Authentication, Encryption https://www.percona.com/live/data-performance-conference-2016/sessions/mari… Window functions in MariaDB https://www.percona.com/live/data-performance-conference-2016/sessions/wind… Exploring MariaDB Query Optimizer with ANALYZE for statements https://www.percona.com/live/data-performance-conference-2016/sessions/expl… Window functions in MariaDB https://www.percona.com/live/data-performance-conference-2016/sessions/wind… Exploring MariaDB Query Optimizer with ANALYZE for statements https://www.percona.com/live/data-performance-conference-2016/sessions/expl… The MariaDB CONNECT Storage Engine to simplify heterogeneous data access https://www.percona.com/live/data-performance-conference-2016/sessions/mari… Low Impact Monitoring https://www.percona.com/live/data-performance-conference-2016/sessions/low-… MariaDB on Power8: https://www.percona.com/live/data-performance-conference-2016/sessions/ibm-… The good and bad on datatypes in different database systems: https://www.percona.com/live/data-performance-conference-2016/sessions/migr… Character sets and Collations explained: https://www.percona.com/live/data-performance-conference-2016/sessions/char… -- Colin Charles, http://bytebot.net/blog/ twitter: @bytebot | skype: colincharles "First they ignore you, then they laugh at you, then they fight you, then you win." -- Mohandas Gandhi

1 0

Re: [Maria-developers] [Commits] be25be4: MDEV-8827 Duplicate key with auto increment
by Jan Lindström 30 Nov '15

30 Nov '15

Ok to push. On Mon, Nov 30, 2015 at 6:45 PM, <serg(a)mariadb.org> wrote: > revision-id: be25be4b1aaf65593d67498c2f30a99fd254ea15 > (mariadb-10.1.8-71-gbe25be4) > parent(s): cf8cb9ebd810a46154f99a73045b53a6913b6eb6 > committer: Sergei Golubchik > timestamp: 2015-11-30 17:45:23 +0100 > message: > > MDEV-8827 Duplicate key with auto increment > > fix innodb auto-increment handling > three bugs: > 1. innobase_next_autoinc treated the case of current<offset incorrectly > 2. ha_innobase::get_auto_increment didn't recalculate current when > increment changed > 3. ha_innobase::get_auto_increment didn't pass offset down to > innobase_next_autoinc > > --- > mysql-test/suite/innodb/r/innodb-autoinc.result | 16 ++++++++++++++-- > mysql-test/suite/innodb/t/innodb-autoinc.test | 3 ++- > storage/innobase/handler/ha_innodb.cc | 16 +++++++--------- > storage/xtradb/handler/ha_innodb.cc | 16 +++++++--------- > 4 files changed, 30 insertions(+), 21 deletions(-) > > diff --git a/mysql-test/suite/innodb/r/innodb-autoinc.result > b/mysql-test/suite/innodb/r/innodb-autoinc.result > index 6ac8bb5..ddca468 100644 > --- a/mysql-test/suite/innodb/r/innodb-autoinc.result > +++ b/mysql-test/suite/innodb/r/innodb-autoinc.result > @@ -567,7 +567,7 @@ Variable_name Value > auto_increment_increment 65535 > auto_increment_offset 65535 > INSERT INTO t1 VALUES (NULL),(NULL); > -ERROR 22003: Out of range value for column 'c1' at row 1 > +ERROR HY000: Failed to read auto-increment value from storage engine > SELECT * FROM t1; > c1 > 1 > @@ -641,6 +641,18 @@ PRIMARY KEY (m)) ENGINE = InnoDB; > INSERT INTO t2 (n,o) VALUES > (1 , 'true'), (1 , 'false'), (2 , 'true'), (2 , 'false'), (3 , 'true'), > (3 , 'false'), (4 , 'true'), (4 , 'false'), (5 , 'true'), (5 , 'false'); > +SELECT * FROM t2; > +m n o > +1 1 TRUE > +2 1 FALSE > +3 2 TRUE > +4 2 FALSE > +5 3 TRUE > +6 3 FALSE > +7 4 TRUE > +8 4 FALSE > +9 5 TRUE > +10 5 FALSE > SHOW CREATE TABLE t2; > Table Create Table > t2 CREATE TABLE `t2` ( > @@ -648,7 +660,7 @@ t2 CREATE TABLE `t2` ( > `n` int(10) unsigned NOT NULL, > `o` enum('FALSE','TRUE') DEFAULT NULL, > PRIMARY KEY (`m`) > -) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1 > +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1 > INSERT INTO t1 (b,c) SELECT n,o FROM t2 ; > SHOW CREATE TABLE t1; > Table Create Table > diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.test > b/mysql-test/suite/innodb/t/innodb-autoinc.test > index ab708e8..dd4c4ae 100644 > --- a/mysql-test/suite/innodb/t/innodb-autoinc.test > +++ b/mysql-test/suite/innodb/t/innodb-autoinc.test > @@ -349,7 +349,7 @@ INSERT INTO t1 VALUES (18446744073709551610); #-- 2^64 > - 2 > SELECT * FROM t1; > SET @@SESSION.AUTO_INCREMENT_INCREMENT=1152921504606846976, > @@SESSION.AUTO_INCREMENT_OFFSET=1152921504606846976; > SHOW VARIABLES LIKE "auto_inc%"; > ---error 167 > +--error 1467 > INSERT INTO t1 VALUES (NULL),(NULL); > SELECT * FROM t1; > DROP TABLE t1; > @@ -401,6 +401,7 @@ CREATE TABLE t2 ( > INSERT INTO t2 (n,o) VALUES > (1 , 'true'), (1 , 'false'), (2 , 'true'), (2 , 'false'), (3 , 'true'), > (3 , 'false'), (4 , 'true'), (4 , 'false'), (5 , 'true'), (5 , 'false'); > +SELECT * FROM t2; > SHOW CREATE TABLE t2; > INSERT INTO t1 (b,c) SELECT n,o FROM t2 ; > SHOW CREATE TABLE t1; > diff --git a/storage/innobase/handler/ha_innodb.cc > b/storage/innobase/handler/ha_innodb.cc > index daa649a..bf86071 100644 > --- a/storage/innobase/handler/ha_innodb.cc > +++ b/storage/innobase/handler/ha_innodb.cc > @@ -2283,10 +2283,11 @@ innobase_next_autoinc( > if (next_value == 0) { > ulonglong next; > > - if (current > offset) { > + if (current >= offset) { > next = (current - offset) / step; > } else { > - next = (offset - current) / step; > + next = 0; > + block -= step; > } > > ut_a(max_value > next); > @@ -15542,10 +15543,7 @@ ha_innobase::get_auto_increment( > > current = *first_value; > > - /* If the increment step of the auto increment column > - decreases then it is not affecting the immediate > - next value in the series. */ > - if (prebuilt->autoinc_increment > increment) { > + if (prebuilt->autoinc_increment != increment) { > > WSREP_DEBUG("autoinc decrease: %llu -> %llu\n" > "THD: %ld, current: %llu, autoinc: > %llu", > @@ -15553,13 +15551,13 @@ ha_innobase::get_auto_increment( > increment, > thd_get_thread_id(ha_thd()), > current, autoinc); > - if (!wsrep_on(ha_thd())) > + if (!wsrep_auto_increment_control || > !wsrep_on(ha_thd())) > { > - current = autoinc - prebuilt->autoinc_increment; > + current = autoinc - > prebuilt->autoinc_increment; > } > > current = innobase_next_autoinc( > - current, 1, increment, 1, col_max_value); > + current, 1, increment, offset, > col_max_value); > > dict_table_autoinc_initialize(prebuilt->table, > current); > > diff --git a/storage/xtradb/handler/ha_innodb.cc > b/storage/xtradb/handler/ha_innodb.cc > index 4aa5457..6659989 100644 > --- a/storage/xtradb/handler/ha_innodb.cc > +++ b/storage/xtradb/handler/ha_innodb.cc > @@ -2556,10 +2556,11 @@ innobase_next_autoinc( > if (next_value == 0) { > ulonglong next; > > - if (current > offset) { > + if (current >= offset) { > next = (current - offset) / step; > } else { > - next = (offset - current) / step; > + next = 0; > + block -= step; > } > > ut_a(max_value > next); > @@ -16178,10 +16179,7 @@ ha_innobase::get_auto_increment( > > current = *first_value; > > - /* If the increment step of the auto increment column > - decreases then it is not affecting the immediate > - next value in the series. */ > - if (prebuilt->autoinc_increment > increment) { > + if (prebuilt->autoinc_increment != increment) { > > WSREP_DEBUG("autoinc decrease: %llu -> %llu\n" > "THD: %ld, current: %llu, autoinc: > %llu", > @@ -16189,13 +16187,13 @@ ha_innobase::get_auto_increment( > increment, > thd_get_thread_id(ha_thd()), > current, autoinc); > - if (!wsrep_on(ha_thd())) > + if (!wsrep_auto_increment_control || > !wsrep_on(ha_thd())) > { > - current = autoinc - prebuilt->autoinc_increment; > + current = autoinc - > prebuilt->autoinc_increment; > } > > current = innobase_next_autoinc( > - current, 1, increment, 1, col_max_value); > + current, 1, increment, offset, > col_max_value); > > dict_table_autoinc_initialize(prebuilt->table, > current); > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

1 0

Re: [Maria-developers] [Commits] 8f616c7: MDEV-7780 - Support for faking server version
by Sergei Golubchik 26 Nov '15

26 Nov '15

Hi, Sergey! On Nov 26, Sergey Vojtovich wrote: > revision-id: 8f616c777bf6756ffb9f5226a77831d3b8c98ad5 (mariadb-10.1.8-80-g8f616c7) > parent(s): 3e69db83a792e7de8a7e7dc501a75f9f22bb6196 > committer: Sergey Vojtovich > timestamp: 2015-11-26 14:06:21 +0400 > message: > > MDEV-7780 - Support for faking server version > > Added --version=str (optional argument sets server version string). > > diff --git a/mysql-test/suite/sys_vars/r/version.result b/mysql-test/suite/sys_vars/r/version.result > new file mode 100644 > index 0000000..6186e46 > --- /dev/null > +++ b/mysql-test/suite/sys_vars/r/version.result > @@ -0,0 +1,4 @@ > +SELECT @@version; > +@@version > +my_favorite_version > +Server version: my_favorite_version Source distribution Sorry, I've just noticed: your test will fail in our packages, because they have something else instead of "Source distribution". I suspect you need to filter that out. Either with replace_result or in perl. You can test your change by bulding with -DBUILD_CONFIG=mysql_release or with -DCOMPILATION_COMMENT="svoj test build :)" Ok to push after fixing it. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 9f3eab9: MDEV-7780 - Support for faking server version
by Sergei Golubchik 26 Nov '15

26 Nov '15

Hi, Sergey! On Nov 26, Sergey Vojtovich wrote: > revision-id: 9f3eab98b93ae289c8c7fba6b4781ca632ec3c1d (mariadb-10.1.8-80-g9f3eab9) > parent(s): 3e69db83a792e7de8a7e7dc501a75f9f22bb6196 > committer: Sergey Vojtovich > timestamp: 2015-11-26 13:23:18 +0400 > message: > > MDEV-7780 - Support for faking server version > > Added --version=str (optional argument sets server version string). > > diff --git a/mysql-test/suite/sys_vars/t/version.test b/mysql-test/suite/sys_vars/t/version.test > new file mode 100644 > index 0000000..08eae97 > --- /dev/null > +++ b/mysql-test/suite/sys_vars/t/version.test > @@ -0,0 +1,2 @@ > +SELECT @@version; > +--exec $MYSQL -e "status" | perl -ne "print \$_ if /^Server version/" Is that portable enough? Do we have other tests that do that? Normally for perl you should use 'perl' command of mysqltest. Like perl; print grep /Server version/, `$ENV{MYSQL} -e status` EOF Regards, Sergei

2 1

[Maria-developers] Moving from Launchpad lists to something else... ?
by Colin Charles 25 Nov '15

25 Nov '15

Hi, I was speaking to Otto (CEO, MariaDB Foundation) and discussing that we should move the lists from Launchpad to something else. We obviously want to preserve the archives, and this isn’t going to happen overnight (something like an aim by the end of the year). Would you be ok with running on Google Groups? Would you prefer being on Mailman? Do you have another self-hosted or (preferably free) hosted solution as your preference? Today, we have several lists (maria-discuss, maria-developers, maria-docs) that are hosted on Launchpad. We also have a few lists (ambassadors, announce, commits, mirroring, maria-buildbot-reports) hosted on Mailman at lists.askmonty.org. Let us know what you think about this Kind Regards, Colin Charles -- Colin Charles, Chief Evangelist, MariaDB Corporation blog: http://bytebot.net/blog/ | t: +1-347-903-3201 | Skype: colincharles | Twitter: @bytebot

6 7

Re: [Maria-developers] [Commits] 6019fee: MDEV-7780 - Support for faking server version
by Sergei Golubchik 25 Nov '15

25 Nov '15

Hi, Sergey! On Nov 25, Sergey Vojtovich wrote: > revision-id: 6019fee7d84e8ec7d64337ad080a04f9c106bb68 (mariadb-10.1.8-74-g6019fee) > parent(s): 2c29e85eafbf5bafe9c431accea9c25db7699eeb > committer: Sergey Vojtovich > timestamp: 2015-11-25 13:58:15 +0400 > message: > > MDEV-7780 - Support for faking server version > > Added --version=str (optional argument sets server version string). > diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result > index 7a6541b..c109ad2 100644 > --- a/mysql-test/r/mysqld--help.result > +++ b/mysql-test/r/mysqld--help.result > @@ -1124,7 +1124,8 @@ The following options may be given as the first argument: > CLIENT_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS > tables in the INFORMATION_SCHEMA > -v, --verbose Used with --help option for detailed help. > - -V, --version Output version information and exit. > + -V, --version[=name] > + Output version information and exit. This is pretty weird. That --version and --version=str have completely different behavior. On the other hand, the server variable is @@version, so --version=str is kind of expected. So --set-version=str or --fake-version=str aren't very intuitive either. I don't know a good solution to this. Use --version? Use --set-version or --fake-version? > --wait-timeout=# The number of seconds the server waits for activity on a > connection before closing it > > diff --git a/mysql-test/suite/sys_vars/t/version.test b/mysql-test/suite/sys_vars/t/version.test > new file mode 100644 > index 0000000..3bc3f2b > --- /dev/null > +++ b/mysql-test/suite/sys_vars/t/version.test > @@ -0,0 +1 @@ > +SELECT @@version; > diff --git a/sql/mysqld.cc b/sql/mysqld.cc would be nice to have a test of the version as sent in the protocol. You can use, for example, mysql client to show that version. Regards, Sergei

2 1

Re: [Maria-developers] [Commits] 2606b87: MDEV-9117: Client Server capability negotiation for MariaDB specific functionality
by Sergei Golubchik 25 Nov '15

25 Nov '15

Hi, Sanja! On Nov 20, sanja(a)mariadb.com wrote: > revision-id: 2606b8744404f352b44c85ee23d41b12cddc3470 (mariadb-10.1.8-51-g2606b87) > parent(s): 81e4ce5e31ba0753d7acfab28bc6c3d83bfad1c6 > committer: Oleksandr Byelkin > timestamp: 2015-11-20 18:23:52 +0100 > message: > > MDEV-9117: Client Server capability negotiation for MariaDB specific functionality > > diff --git a/client/mysql.cc b/client/mysql.cc > index 92324c6..e242c25 100644 > --- a/client/mysql.cc > +++ b/client/mysql.cc > @@ -152,7 +152,7 @@ static ulong opt_max_allowed_packet, opt_net_buffer_length; > static uint verbose=0,opt_silent=0,opt_mysql_port=0, opt_local_infile=0; > static uint my_end_arg; > static char * opt_mysql_unix_port=0; > -static int connect_flag=CLIENT_INTERACTIVE; > +static ulong long connect_flag=CLIENT_INTERACTIVE; Either "ulonglong" or "unsigned long long". But not "ulong long", please. > static my_bool opt_binary_mode= FALSE; > static int interrupted_query= 0; > static char *current_host,*current_db,*current_user=0,*opt_password=0, > diff --git a/include/mysql.h b/include/mysql.h > index f088ad6..d398734 100644 > --- a/include/mysql.h > +++ b/include/mysql.h > @@ -270,7 +270,7 @@ typedef struct st_mysql > unsigned long thread_id; /* Id for connection in server */ > unsigned long packet_length; > unsigned int port; > - unsigned long client_flag,server_capabilities; > + unsigned long long client_flag,server_capabilities; This is an incompatible change, it breaks the ABI. If we have to have this change in libmysqlclient, you can put the new flags in the extension area. But, really, perhaps you should switch to Connector/C? > unsigned int protocol_version; > unsigned int field_count; > unsigned int server_status; > diff --git a/sql-common/client.c b/sql-common/client.c > index 609eef5..e108c4b 100644 > --- a/sql-common/client.c > +++ b/sql-common/client.c > @@ -2672,15 +2673,26 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, > if (mysql->client_flag & CLIENT_PROTOCOL_41) > { > /* 4.1 server and 4.1 client has a 32 byte option flag */ > - int4store(buff,mysql->client_flag); > + bzero(buff+9, 32-9); > + if (mysql->server_capabilities & MARIADB_CLIENT_EXTENDED_FLAGS) > + { > + DBUG_ASSERT(mysql->client_flag & CLIENT_LONG_PASSWORD); 1. add DBUG_ASSERT(mysql->client_flag & CLIENT_PROTOCOL_41) 2. define CLIENT_LONG_PASSWORD to be 0 and CLIENT_MYSQL to be 1. Currently CLIENT_LONG_PASSWORD is not used anywhere, it's never checked. So you can safely define it to be 0 and use bit 1 for CLIENT_MYSQL, as we've discussed. > + /* > + first part of bytes - CLIENT_LONG_PASSWORD to signal mariadb extensions > + */ > + mysql->client_flag|= MARIADB_CLIENT_EXTENDED_FLAGS; > + int4store(buff, (mysql->client_flag & (~CLIENT_LONG_PASSWORD))); I think MariaDB clients should never set CLIENT_MYSQL. Independently from MARIADB_CLIENT_EXTENDED_FLAGS. > + int4store(buff + 28, (mysql->client_flag >> 32)); > + } > + else > + int4store(buff, mysql->client_flag); > int4store(buff+4, net->max_packet_size); > buff[8]= (char) mysql->charset->number; > - bzero(buff+9, 32-9); > end= buff+32; > } > else > { > - int2store(buff, mysql->client_flag); > + int2store(buff, (mysql->client_flag & 0xffff)); > int3store(buff+2, net->max_packet_size); > end= buff+5; > } > @@ -3682,7 +3697,20 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, > if ((mysql->server_capabilities & CLIENT_PLUGIN_AUTH) && > strncmp(mysql->server_version, RPL_VERSION_HACK, > sizeof(RPL_VERSION_HACK) - 1) == 0) > + { > mysql->server_version+= sizeof(RPL_VERSION_HACK) - 1; > + mysql->server_capabilities|= ext_server_capabilities; > + if (!(mysql->server_capabilities & MARIADB_CLIENT_EXTENDED_FLAGS) && > + (mysql->client_flag & MARIADB_CLIENT_PROGRESS)) > + { > + /* old mariadb fix progress flag */ > + mysql->client_flag|= CLIENT_PROGRESS_OBSOLETE; > + if (mysql->server_capabilities & CLIENT_PROGRESS_OBSOLETE) > + { > + mysql->server_capabilities|= MARIADB_CLIENT_PROGRESS; > + } looks good, but please test this. New client, old server. And old client, new server too. > + } > + } > > if (pkt_end >= end + SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1) > { > diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c > index 98f42ff..255ac25 100644 > --- a/tests/mysql_client_test.c > +++ b/tests/mysql_client_test.c > @@ -15336,7 +15336,7 @@ static void test_mysql_insert_id() > > myheader("test_mysql_insert_id"); > > - rc= mysql_query(mysql, "drop table if exists t1"); > + rc= mysql_query(mysql, "drop table if exists t1,t2"); why? > myquery(rc); > /* table without auto_increment column */ > rc= mysql_query(mysql, "create table t1 (f1 int, f2 varchar(255), key(f1))"); > @@ -16186,6 +16186,10 @@ static void test_change_user() > sprintf(buff, "drop database if exists %s", db); > rc= mysql_query(mysql, buff); > myquery(rc); > + sprintf(buff, "set local sql_mode=''"); why? > + rc= mysql_query(mysql, buff); > + myquery(rc); Regards, Sergei

3 7

[Maria-developers] Please review a simple patch changing shift/reduce conflicts from 160 to 121
by Alexander Barkov 23 Nov '15

23 Nov '15

Hi, The patch is for 10.2 (but should probably be safe for 10.1 as well) Thanks.

2 1

Re: [Maria-developers] [Commits] 334323b: MDEV-8542 - The "aria_recover" variable should be renamed "aria_recover_options"
by Sergei Golubchik 23 Nov '15

23 Nov '15

Hi, Sergey! On Nov 20, Sergey Vojtovich wrote: > revision-id: 334323bb3e5ca973cf239dce21a7d5510407f230 (mariadb-10.1.8-59-g334323b) > parent(s): a1ab4314d1f88fa954a774c322709822d7b95344 > committer: Sergey Vojtovich > timestamp: 2015-11-20 17:36:23 +0400 > message: > > MDEV-8542 - The "aria_recover" variable should be renamed "aria_recover_options" > to match MyISAM > > Added aria_recover_options, marked aria_recover as deprecated. > > diff --git a/mysql-test/suite/maria/maria-recover-master.opt b/mysql-test/suite/maria/maria-recover-master.opt > index 7582a38..976c388 100644 > --- a/mysql-test/suite/maria/maria-recover-master.opt > +++ b/mysql-test/suite/maria/maria-recover-master.opt > @@ -1 +1 @@ > ---loose-aria-recover=backup --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp > +--loose-aria-recover-options=backup --loose-aria-log-dir-path=$MYSQLTEST_VARDIR/tmp I'm not going to grep the code to see whether you've renamed all instances of 'aria[-_]recover' - I assume you did that and run tests too. > diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc > index 2e2aa71..064d759 100644 > --- a/storage/maria/ha_maria.cc > +++ b/storage/maria/ha_maria.cc > @@ -256,6 +256,11 @@ static MYSQL_SYSVAR_ULONG(pagecache_file_hash_size, pagecache_file_hash_size, > 512, 128, 16384, 1); > > static MYSQL_SYSVAR_SET(recover, maria_recover_options, PLUGIN_VAR_OPCMDARG, > + "Deprecated and will be removed in a future release. Please use " > + "--aria-recover-options instead.", > + NULL, NULL, HA_RECOVER_DEFAULT, &maria_recover_typelib); > + Why? my_getopt does unambigous prefix matching, so --aria-recover will contnue to work after the rename without any explicit deprecated variables. So this one doesn't do any good. In fact, this variable has bad effects, without it 'aria-recov' (or any other unambigous prefix of aria-recover) would continue to work, but with this new deprecated variable 'aria-recov' will no longer be unambigous. > +static MYSQL_SYSVAR_SET(recover_options, maria_recover_options, PLUGIN_VAR_OPCMDARG, > "Specifies how corrupted tables should be automatically repaired", > NULL, NULL, HA_RECOVER_DEFAULT, &maria_recover_typelib); Regards, Sergei

2 2

[Maria-developers] any plans to bump soname for libmysqlclient.so?
by Honza Horak 19 Nov '15

19 Nov '15

Hi, mysql 5.7 bumped soname of the libmysqlclient.so. Are there any plans to do something like that in mariadb's libmysqlclient.so? I'm also wondering whether there are any particular plans to keep compatibility of the client library (libmysqlclient.so) between MariaDB and MySQL in the future. Honza

3 2

Re: [Maria-developers] [Commits] 2709165: MDEV-9128 - Compiling on IBM System Z fails
by Jan Lindström 18 Nov '15

18 Nov '15

Hi Sergey, Is this true only for innodb_plugin ? R: Jan On Wed, Nov 18, 2015 at 2:07 PM, Sergey Vojtovich <svoj(a)mariadb.org> wrote: > revision-id: 27091653333caed4691d1203f0b91d22d0e7927b > (mariadb-10.1.8-67-g2709165) > parent(s): bff6780806f4afed8faaf4c79b1593964564097e > committer: Sergey Vojtovich > timestamp: 2015-11-18 15:51:20 +0400 > message: > > MDEV-9128 - Compiling on IBM System Z fails > > Provided IBM System Z have outdated compiler version, which supports gcc > sync > builtins but not gcc atomic builtins. It also has weak memory model. > > InnoDB attempted to verify if __sync_lock_test_and_set() is available by > checking IB_STRONG_MEMORY_MODEL. This macro has nothing to do with > availability > of __sync_lock_test_and_set(), the right one is HAVE_ATOMIC_BUILTINS. > > --- > storage/innobase/include/os0sync.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/storage/innobase/include/os0sync.h > b/storage/innobase/include/os0sync.h > index 8e4b4f4..e192a3a 100644 > --- a/storage/innobase/include/os0sync.h > +++ b/storage/innobase/include/os0sync.h > @@ -487,7 +487,7 @@ os_atomic_clear(volatile lock_word_t* ptr) > __atomic_clear(ptr, __ATOMIC_RELEASE); > } > > -# elif defined(IB_STRONG_MEMORY_MODEL) > +# elif defined(HAVE_ATOMIC_BUILTINS) > > /** Do an atomic test and set. > @param[in,out] ptr Memory location to set to non-zero > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

2 1

[Maria-developers] Virtual columns and 'mysqldump' (and similar)
by Peter Laursen 18 Nov '15

18 Nov '15

I reported this bug report to Oracle: http://bugs.mysql.com/bug.php?id=79148 It is almost the same in MariaDB - but the error message is different, see SELECT VERSION(); -- 10.1.2-MariaDB-log CREATE TABLE `vc_test`.`t1`( `id` INT NOT NULL, `id3` INT AS ( id*3 ) VIRTUAL ); INSERT INTO `vc_test`.`t1` VALUES (1,3); -- retruns: Error Code: 1906 - The value specified for computed column 'id3' in table 't1' ignored SELECT * FROM t1; -- returns empty set So here the error message is that "value is ignored" (not that it is "not allowed"). It looks to me like somebody in MariaDB actually identified the problem, but forgot to finish things. The statement should succeed (maybe raise a warning), and the "specified value should be ignored" as the error message says, but what it in reality is not. What say?

3 12

Re: [Maria-developers] [Commits] 685c70d: MDEV-4829 BEFORE INSERT triggers dont issue 1406 error.
by Sergei Golubchik 17 Nov '15

17 Nov '15

Hi, Alexey! On Nov 17, Alexey Botchkov wrote: > revision-id: 685c70d39ac6599b448e86a3896a8c6836079b78 (mariadb-10.1.8-54-g685c70d) > parent(s): 0dfa0eef596ee677b55976793d632dc9b36928c7 > committer: Alexey Botchkov > timestamp: 2015-11-16 17:20:35 +0400 > message: > > MDEV-4829 BEFORE INSERT triggers dont issue 1406 error. > > The STRICT mode was reimplemented using Strict_handler instead of the > THD::abort_on_warning flag. I like the approach, in general. But 1. Let's do it in 10.2 2. Let's first wait for Bar to do his changes where only "true" fields will respect strict mode. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 5803178: MDEV-4829 BEFORE INSERT triggers dont issue 1406 error.
by Sergei Golubchik 17 Nov '15

17 Nov '15

Hi, Alexey! On Nov 17, Alexey Botchkov wrote: > revision-id: 580317835f9758a9536150e02031ff520e747089 (mariadb-10.1.8-54-g5803178) > parent(s): 0dfa0eef596ee677b55976793d632dc9b36928c7 > committer: Alexey Botchkov > timestamp: 2015-11-17 00:42:18 +0400 > message: > > MDEV-4829 BEFORE INSERT triggers dont issue 1406 error. > Turn the 'abort_on_warning' on for assigning value to fields. ok to push Regards, Sergei

1 0

Re: [Maria-developers] [Commits] bff67808: MDEV-7806 - thread_pool_size is not auto-sized
by Sergei Golubchik 17 Nov '15

17 Nov '15

Hi, Sergey! On Nov 17, Sergey Vojtovich wrote: > revision-id: bff6780806f4afed8faaf4c79b1593964564097e (mariadb-10.1.8-66-gbff67808) > parent(s): c0216f1d02e63686f986fa8f352fdf6de61249a7 > committer: Sergey Vojtovich > timestamp: 2015-11-17 19:33:01 +0400 > message: > > MDEV-7806 - thread_pool_size is not auto-sized > > thread_pool_size is auto-sized before my_getopt(). But my_getopt starts from > resetting all options to their default values. So the auto-sized value is lost. > > Fixed by moving thread_pool_size auto-sizing after my_getopt(). Ok to push! Regards, Sergei

1 0

Re: [Maria-developers] [Commits] f21705d: MDEV-7806 - thread_pool_size is not auto-sized
by Sergei Golubchik 17 Nov '15

17 Nov '15

Hi, Sergey! On Nov 17, Sergey Vojtovich wrote: > revision-id: f21705dfbfcd87e46937222eb860727beb21a89b (mariadb-10.1.8-66-gf21705d) > parent(s): c0216f1d02e63686f986fa8f352fdf6de61249a7 > committer: Sergey Vojtovich > timestamp: 2015-11-17 13:13:47 +0400 > message: > > MDEV-7806 - thread_pool_size is not auto-sized > > thread_pool_size is auto-sized before my_getopt(). But my_getopt starts from > resetting all options to their default values. So the auto-sized value is lost. > > Fixed by autosizing default value directly. > > diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc > index 682d803..e65a939 100644 > --- a/sql/sys_vars.cc > +++ b/sql/sys_vars.cc > @@ -3270,7 +3270,7 @@ static Sys_var_uint Sys_threadpool_size( > "This parameter is roughly equivalent to maximum number of concurrently " > "executing threads (threads in a waiting state do not count as executing).", > GLOBAL_VAR(threadpool_size), CMD_LINE(REQUIRED_ARG), > - VALID_RANGE(1, MAX_THREAD_GROUPS), DEFAULT(8), BLOCK_SIZE(1), > + VALID_RANGE(1, MAX_THREAD_GROUPS), DEFAULT(my_getncpus()), BLOCK_SIZE(1), > NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_threadpool_size), > ON_UPDATE(fix_threadpool_size) > ); Strange solution. Why wouldn't you move autosizing after config variables are read? Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

2 4

Re: [Maria-developers] [Commits] 096fd8f: MDEV-9033 : Incorrect statements binlogged on slave with do_domain_ids=(...)
by Nirbhay Choubey 17 Nov '15

17 Nov '15

Hi Kristian, Can you please review this patch? - Nirbhay On Fri, Nov 13, 2015 at 5:23 PM, Nirbhay Choubey <nirbhay(a)mariadb.com> wrote: > revision-id: 096fd8f57664d0b3061f0e781a31bfa3cc6bf6cd > parent(s): a574407444fc3ea93ca88afa93dc18154251bf74 > committer: Nirbhay Choubey > branch nick: 10.1.b9033 > timestamp: 2015-11-13 17:23:49 -0500 > message: > > MDEV-9033 : Incorrect statements binlogged on slave with > do_domain_ids=(...) > > In domain ID based filtering, a flag is used to filter-out > the events that belong to a particular domain. This flag gets > set when IO thread receives a GTID_EVENT for the domain on > filter list and its reset at the last event in the GTID group. > The resetting, however, was wrongly done before the decision to > write/filter the event from relay log is made. As a result, the > last event in the group will always pass through the filter. > Fixed by deferring the reset logic. Also added a test case. > > --- > mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result | 73 ++++++++++++++++++++ > mysql-test/suite/rpl/t/rpl_gtid_mdev9033.cnf | 20 ++++++ > mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test | 92 > +++++++++++++++++++++++++ > sql/slave.cc | 19 +---- > 4 files changed, 188 insertions(+), 16 deletions(-) > > diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result > b/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result > new file mode 100644 > index 0000000..fdee91f > --- /dev/null > +++ b/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result > @@ -0,0 +1,73 @@ > +include/rpl_init.inc [topology=1->2->3] > +include/stop_slave.inc > +CHANGE MASTER TO > +MASTER_USE_GTID = SLAVE_POS, IGNORE_SERVER_IDS = (2,3); > +CHANGE MASTER "M_3" TO > +MASTER_HOST = "127.0.0.1", MASTER_PORT = SERVER_MYPORT_3, > +MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > +IGNORE_SERVER_IDS = (1,2); > +START ALL SLAVES; > +Warnings: > +Note 1937 SLAVE 'M_3' started > +Note 1937 SLAVE '' started > +include/stop_slave.inc > +CHANGE MASTER "M_1" TO > +MASTER_HOST = "127.0.0.1", MASTER_PORT = MASTER_MYPORT, > +MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > +IGNORE_SERVER_IDS = (2,3); > +CHANGE MASTER TO > +MASTER_USE_GTID = SLAVE_POS, IGNORE_SERVER_IDS = (1,3); > +START ALL SLAVES; > +Warnings: > +Note 1937 SLAVE 'M_1' started > +Note 1937 SLAVE '' started > +CHANGE MASTER "M_2" TO > +MASTER_HOST = "127.0.0.1", MASTER_PORT = SLAVE_MYPORT, > +MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > +IGNORE_SERVER_IDS = (1,3); > +CHANGE MASTER "M_3" TO > +MASTER_HOST = "127.0.0.1", MASTER_PORT = SERVER_MYPORT_3, > +MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > +IGNORE_SERVER_IDS = (1,2); > +START ALL SLAVES; > +Warnings: > +Note 1937 SLAVE 'M_3' started > +Note 1937 SLAVE 'M_2' started > +CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; > +INSERT INTO t1 VALUES (1, "m1"); > +INSERT INTO t1 VALUES (2, "m2"), (3, "m3"), (4, "m4"); > +include/save_master_gtid.inc > +include/sync_with_master_gtid.inc > +SELECT * FROM t1 ORDER BY a; > +a b > +1 m1 > +2 m2 > +3 m3 > +4 m4 > +include/sync_with_master_gtid.inc > +SELECT * FROM t1 ORDER BY a; > +a b > +1 m1 > +2 m2 > +3 m3 > +4 m4 > +# Cleanup > +DROP TABLE t1; > +include/save_master_gtid.inc > +include/sync_with_master_gtid.inc > +include/sync_with_master_gtid.inc > +STOP SLAVE "M_3"; > +RESET SLAVE "M_3" ALL; > +STOP SLAVE "M_1"; > +RESET SLAVE "M_1" ALL; > +STOP SLAVE "M_2"; > +RESET SLAVE "M_2" ALL; > +STOP SLAVE "M_3"; > +RESET SLAVE "M_3" ALL; > +include/sync_with_master_gtid.inc > +STOP SLAVE; > +CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_SERVER_IDS = (); > +include/sync_with_master_gtid.inc > +STOP SLAVE; > +CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_SERVER_IDS = (); > +# End of test. > diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.cnf > b/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.cnf > new file mode 100644 > index 0000000..80b6649 > --- /dev/null > +++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.cnf > @@ -0,0 +1,20 @@ > +!include ../my.cnf > + > +[mysqld.1] > +log-slave-updates > +loose-innodb > +gtid_domain_id=1 > + > +[mysqld.2] > +log-slave-updates > +loose-innodb > +gtid_domain_id=2 > + > +[mysqld.3] > +log-slave-updates > +loose-innodb > +gtid_domain_id=3 > + > +[ENV] > +SERVER_MYPORT_3= @mysqld.3.port > +SERVER_MYSOCK_3= @mysqld.3.socket > diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test > b/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test > new file mode 100644 > index 0000000..8b51d96 > --- /dev/null > +++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev9033.test > @@ -0,0 +1,92 @@ > +--source include/have_innodb.inc > +--let $rpl_topology=1->2->3 > +--source include/rpl_init.inc > + > +--connection server_2 > +--source include/stop_slave.inc > +eval CHANGE MASTER TO > + MASTER_USE_GTID = SLAVE_POS, IGNORE_SERVER_IDS = (2,3); > +--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 > +eval CHANGE MASTER "M_3" TO > + MASTER_HOST = "127.0.0.1", MASTER_PORT = $SERVER_MYPORT_3, > + MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > + IGNORE_SERVER_IDS = (1,2); > +START ALL SLAVES; > + > +--connection server_3 > +--source include/stop_slave.inc > +--replace_result $MASTER_MYPORT MASTER_MYPORT > +eval CHANGE MASTER "M_1" TO > + MASTER_HOST = "127.0.0.1", MASTER_PORT = $MASTER_MYPORT, > + MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > + IGNORE_SERVER_IDS = (2,3); > +eval CHANGE MASTER TO > + MASTER_USE_GTID = SLAVE_POS, IGNORE_SERVER_IDS = (1,3); > +START ALL SLAVES; > + > +--connection server_1 > +--replace_result $SLAVE_MYPORT SLAVE_MYPORT > +eval CHANGE MASTER "M_2" TO > + MASTER_HOST = "127.0.0.1", MASTER_PORT = $SLAVE_MYPORT, > + MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > + IGNORE_SERVER_IDS = (1,3); > +--replace_result $SERVER_MYPORT_3 SERVER_MYPORT_3 > +eval CHANGE MASTER "M_3" TO > + MASTER_HOST = "127.0.0.1", MASTER_PORT = $SERVER_MYPORT_3, > + MASTER_USER = "root", MASTER_USE_GTID = SLAVE_POS, > + IGNORE_SERVER_IDS = (1,2); > +START ALL SLAVES; > + > +connection server_1; > + > +CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; > +INSERT INTO t1 VALUES (1, "m1"); > +INSERT INTO t1 VALUES (2, "m2"), (3, "m3"), (4, "m4"); > + > +--source include/save_master_gtid.inc > + > +connection server_2; > +--source include/sync_with_master_gtid.inc > +let $wait_condition=SELECT COUNT(*)=4 FROM t1; > +--source include/wait_condition.inc > +SELECT * FROM t1 ORDER BY a; > + > +connection server_3; > +--source include/sync_with_master_gtid.inc > +--source include/wait_condition.inc > +SELECT * FROM t1 ORDER BY a; > + > +--echo # Cleanup > +--connection server_1 > +DROP TABLE t1; > +--source include/save_master_gtid.inc > +--connection server_2 > +--source include/sync_with_master_gtid.inc > +--connection server_3 > +--source include/sync_with_master_gtid.inc > + > +--connection server_2 > +STOP SLAVE "M_3"; > +RESET SLAVE "M_3" ALL; > + > +--connection server_3 > +STOP SLAVE "M_1"; > +RESET SLAVE "M_1" ALL; > + > +--connection server_1 > +STOP SLAVE "M_2"; > +RESET SLAVE "M_2" ALL; > +STOP SLAVE "M_3"; > +RESET SLAVE "M_3" ALL; > + > +--connection server_2 > +--source include/sync_with_master_gtid.inc > +STOP SLAVE; > +CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_SERVER_IDS = (); > + > +--connection server_3 > +--source include/sync_with_master_gtid.inc > +STOP SLAVE; > +CHANGE MASTER TO MASTER_USE_GTID = NO, IGNORE_SERVER_IDS = (); > + > +--echo # End of test. > diff --git a/sql/slave.cc b/sql/slave.cc > index fed171b..b93fb3d 100644 > --- a/sql/slave.cc > +++ b/sql/slave.cc > @@ -5870,22 +5870,6 @@ static int queue_event(Master_info* mi,const char* > buf, ulong event_len) > } > };); > > - if (mi->using_gtid != Master_info::USE_GTID_NO && > - mi->domain_id_filter.is_group_filtered() && > - mi->events_queued_since_last_gtid > 0 && > - ((mi->last_queued_gtid_standalone && > - !Log_event::is_part_of_group((Log_event_type)(uchar) > - buf[EVENT_TYPE_OFFSET])) || > - (!mi->last_queued_gtid_standalone && > - ((uchar)buf[EVENT_TYPE_OFFSET] == XID_EVENT || > - ((uchar)buf[EVENT_TYPE_OFFSET] == QUERY_EVENT && > - Query_log_event::peek_is_commit_rollback(buf, event_len, > - checksum_alg)))))) > - { > - /* Reset the domain_id_filter flag. */ > - mi->domain_id_filter.reset_filter(); > - } > - > if (mi->using_gtid != Master_info::USE_GTID_NO && mi->gtid_event_seen) > { > if (unlikely(mi->gtid_reconnect_event_skip_count)) > @@ -6071,6 +6055,9 @@ static int queue_event(Master_info* mi,const char* > buf, ulong event_len) > */ > mi->gtid_current_pos.update(&mi->last_queued_gtid); > mi->events_queued_since_last_gtid= 0; > + > + /* Reset the domain_id_filter flag. */ > + mi->domain_id_filter.reset_filter(); > } > > skip_relay_logging: > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

2 1

[Maria-developers] On the issue of Seconds_behind_master and Parallel Replication
by Kristian Nielsen 16 Nov '15

16 Nov '15

It was brought to my attention an issue with parallel replication and the Seconds_Behind_Master field of SHOW SLAVE STATUS. I have a possible patch for this, but I wanted to discuss it on the list, as it changes semantics compared to the non-parallel case. Each binlog event contains a timestamp (**) of when the event was created on the master. Whenever the slave SQL thread reads an event from the relay log, it updates the value of Seconds_Behind_Master to the difference between the slave's current time and the event's timestamp. Now in parallel replication, the SQL thread can read a large number of events from the relay log and queue them in-memory for the worker threads. So a small value of Seconds_Behind_Master means only that recent events have been queued - it might still be a long time before the worker threads have had time to actually execute all the queued events. Apparently the problem is (justified) user confusion about this queuing delay not being reflected in Seconds_Behind_Master. The same problem actually exists in the non-parallel case. In case of a large transaction, the Seconds_Behind_Master can be small even though there is still a large amount of execution time remaining for the transaction to complete on the slave. However, in the non-parallel case, at most one transaction can be involved. In the parallel case, the problem is amplified by the potential of thousands of queued transactions awaiting execution. So how to solve it? Attached is a patch that implements one possible solution: the Seconds_Behind_Master is only updated after a transaction commits, with the timestamp of the commit events. This seems more intuitive anyway. But it does introduce a semantic difference between the non-parallel and parallel behaviour for Seconds_Behind_Master. The value will in general be larger on a parallel slave than on a non-parallel slave, for the same actual slave lag. Monty suggested changing the behaviour also for non-parallel mode - letting Seconds_Behind_Master reflect only events actually committed, not just read from the relay log. This would introduce an incompatible behaviour for Seconds_Behind_Master, but could perhaps be done for 10.1, if desired. Doing it in stable 10.0 would be more drastic. So any opinions on this? - Should Seconds_Behind_Master be changed as per above in parallel replication (from 10.0 on)? - If not, any suggestion for another semantics for Seconds_Behind_Master in parallel replication? - If so, should the change to Seconds_Behind_Master also be done in the non-parallel case in 10.1? What about 10.0? - Any comments on the patch? Here is a test case that shows the problem. It simulates a slave catching up with a bunch of INSERT(SLEEP(1)). Without my patch, Seconds_Behind_Master=2 just after starting the parallel slave, while the non-parallel slave shows Seconds_Behind_Master=9. With my patch, the parallel slave shows Seconds_Behind_Master=11. ----------------------------------------------------------------------- --source include/have_innodb.inc --source include/have_binlog_format_statement.inc --let $rpl_topology=1->2 --source include/rpl_init.inc # Test various aspects of parallel replication. --connection server_1 ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format"); CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; --save_master_pos --connection server_2 --sync_with_master --source include/stop_slave.inc SET GLOBAL slave_parallel_threads=1; --connection server_1 --disable_warnings INSERT INTO t1 VALUES (1, SLEEP(1)); INSERT INTO t1 VALUES (2, SLEEP(1)); INSERT INTO t1 VALUES (3, SLEEP(1)); INSERT INTO t1 VALUES (4, SLEEP(1)); INSERT INTO t1 VALUES (5, SLEEP(1)); INSERT INTO t1 VALUES (6, SLEEP(1)); INSERT INTO t1 VALUES (7, SLEEP(1)); INSERT INTO t1 VALUES (8, SLEEP(1)); INSERT INTO t1 VALUES (9, SLEEP(1)); INSERT INTO t1 VALUES (10, SLEEP(1)); --disable_warnings --save_master_pos --connection server_2 --source include/start_slave.inc SELECT SLEEP(1); --let $status_items= Seconds_Behind_Master --source include/show_slave_status.inc --sync_with_master --let $status_items= Seconds_Behind_Master --source include/show_slave_status.inc # Clean up. --connection server_2 --source include/stop_slave.inc SET GLOBAL slave_parallel_threads=DEFAULT; --source include/start_slave.inc --connection server_1 DROP TABLE t1; --source include/rpl_end.inc ----------------------------------------------------------------------- Thanks, - Kristian. ** The full detail is a bit more complex. Some events actually contains the time when the corresponding query _started_ executing, and another value which is the duration of execution. These are added by the slave to get the timestamp for the creation of the event (at the end of query exection). Also, the slave adjusts the timestamp with any time difference between the master and slave clock (eg. time zone for example).

6 10

[Maria-developers] MDEV-8109 unexpected CAST result
by Alexander Barkov 11 Nov '15

11 Nov '15

Hi Serg, Please review my patch for MDEV-8109. Thanks!

2 1

[Maria-developers] Please review MDEV-8140 patch
by chengxiaoz 10 Nov '15

10 Nov '15

Hi kentoku and Sergey, Please review mypatch for MDEV-8140. https://github.com/MariaDB/server/pull/61 Thanks.

3 3

[Maria-developers] Please review MDEV-8140 patch
by chengxiaoz＠189.cn 08 Nov '15

08 Nov '15

1 0

Re: [Maria-developers] [Commits] 7931ca4: MDEV-9024 Build fails with VS2015
by Sergei Golubchik 05 Nov '15

05 Nov '15

Hi, Wlad! Mostly ok, please see below On Nov 03, wlad(a)mariadb.com wrote: > revision-id: 7931ca4f89ad5cd38ea3dc54f1363b7de2fd3414 (mariadb-10.0.22-5-g7931ca4) > parent(s): fa1438cbf4307731a54ea4137d5f7d4b744cdfbc > committer: Vladislav Vaintroub > timestamp: 2015-11-03 11:32:00 +0100 > message: > > MDEV-9024 Build fails with VS2015 > > Fix build failures caused by new C runtime library > - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads > - P_tmpdir, tzname are no more defined > - lfind() and lsearch() in lf_hash.c had to be renamed, declaration > conflicts with some C runtime functions with the same name declared > in a header included by stdlib.h > > Also fix couple of annoying warnings : > - remove #define NOMINMAX from config.h to avoid "redefined" compiler > warnings(NOMINMAX is already in compile flags) > > - disable incremental linker in Debug as well (feature not used much > and compiler crashes often) > > > Also simplify package building with Wix, require Wix 3.9 or later > (VS2015 is not compatible with old Wix 3.5/3.6) > > diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake > index 4c01bab..fd6e739 100644 > --- a/cmake/os/Windows.cmake > +++ b/cmake/os/Windows.cmake > @@ -181,14 +184,13 @@ CHECK_SYMBOL_REPLACEMENT(S_IROTH _S_IREAD sys/stat.h) > CHECK_SYMBOL_REPLACEMENT(S_IFIFO _S_IFIFO sys/stat.h) > CHECK_SYMBOL_REPLACEMENT(SIGQUIT SIGTERM signal.h) > CHECK_SYMBOL_REPLACEMENT(SIGPIPE SIGINT signal.h) > -CHECK_SYMBOL_REPLACEMENT(isnan _isnan float.h) How can this be wrong? It checks whetherone should use _isnan instead of isnan. That seems like the kind of check that works both with old and new VS. > CHECK_SYMBOL_REPLACEMENT(finite _finite float.h) > diff --git a/config.h.cmake b/config.h.cmake > index 46eed79..a1d505f 100644 > --- a/config.h.cmake > +++ b/config.h.cmake > > -/* We don't want the min/max macros */ > -#ifdef __WIN__ > -#define NOMINMAX > -#endif I'd generally prefer to define symbols in headers, instead of putting everything into ever-growing compiler command line Besides, the minimal fix for the redefinition warning is -#define NOMINMAX +#define NOMINMAX 1 because -DNOMINMAX defines NOMINMAX to be 1, not empty. > /* > MySQL features > */ > diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c > index aa96ca9..fa92971 100644 > --- a/mysys/lf_hash.c > +++ b/mysys/lf_hash.c > @@ -43,7 +43,7 @@ const int LF_HASH_OVERHEAD= sizeof(LF_SLIST); > > /* > a structure to pass the context (pointers two the three successive elements > - in a list) from lfind to linsert/ldelete > + in a list) from my_lfind to my_linsert/my_ldelete > */ > typedef struct { > intptr volatile *prev; > @@ -70,7 +70,7 @@ typedef struct { > cursor is positioned in either case > pins[0..2] are used, they are NOT removed on return > */ > -static int lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr, > +static int my_lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr, er... I don't like that. lfind/lsearch are internal static functions in lf_hash.c, they shouldn't need or use my_ prefix. Two alternatives: 1. #define lfind remap_lfind_for_win #include <my_global.h> #include <my_sys.h> #undef lfind 2. -static int lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr, +static int l_find(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr, > const uchar *key, uint keylen, CURSOR *cursor, LF_PINS *pins) > { > uint32 cur_hashnr; > diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt > index 3b9b72f..0535a48 100644 > --- a/win/packaging/CMakeLists.txt > +++ b/win/packaging/CMakeLists.txt > SET(CPACK_WIX_UPGRADE_CODE "49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3") > - SET(CPACK_WIX_PACKAGE_NAME "MariaDB @MAJOR_VERSION@.@MINOR_VERSION@") > + SET(CPACK_WIX_PACKAGE_NAME "MariaDB ${MAJOR_VERSION}.${MINOR_VERSION}") > ELSE() > SET(CPACK_WIX_UPGRADE_CODE "2331E7BD-EE58-431B-9E18-B2B918BCEB1B") > - SET(CPACK_WIX_PACKAGE_NAME "MariaDB @MAJOR_VERSION@.@MINOR_VERSION@ (x64)") > + SET(CPACK_WIX_PACKAGE_NAME "MariaDB ${MAJOR_VERSION}.${MINOR_VERSION} (x64)") Weird. I was sure I've fixed this months ago :-[] Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 01bd373: MDEV-8437 - plugin variables conflict with bootstrap
by Sergei Golubchik 05 Nov '15

05 Nov '15

Hi, Sergey! On Nov 03, Sergey Vojtovich wrote: > revision-id: 01bd3737777f8f0cf2e1737d01a48033a7615b2a (mariadb-10.1.8-23-g01bd373) > parent(s): dc40d737d4af3cb0e272c58507ad54e4eb24be28 > committer: Sergey Vojtovich > timestamp: 2015-11-03 14:02:49 +0400 > message: > > MDEV-8437 - plugin variables conflict with bootstrap ok to push > There is no strong need to change password column: the only side effect is > that 4.0 -> 10.1 upgrades may get root/debian-sys-maint passwords stored in old > format. This should be perfectly acceptable, since all password at this point > are stored in old format. Regards, Sergei

2 3

Re: [Maria-developers] [Commits] 178cddd: MDEV-9082 - Debian: mysql_install_db is called on upgrade
by Sergei Golubchik 05 Nov '15

05 Nov '15

Hi, Sergey! On Nov 05, Sergey Vojtovich wrote: > revision-id: 178cddd664cb4ce2c6ccbe76c33e4fd2c1fc1b3d (mariadb-10.1.8-25-g178cddd) > parent(s): 2ef562d2c74297b0b92c4322697dad98767cc873 > committer: Sergey Vojtovich > timestamp: 2015-11-05 13:57:24 +0400 > message: > > MDEV-9082 - Debian: mysql_install_db is called on upgrade looks ok to me Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 2ef562d: MDEV-9080 - Debian: incorrect empty password check in postinst
by Sergei Golubchik 05 Nov '15

05 Nov '15

Hi, Sergey! ok to push On Nov 04, Sergey Vojtovich wrote: > revision-id: 2ef562d2c74297b0b92c4322697dad98767cc873 (mariadb-10.1.8-24-g2ef562d) > parent(s): 01bd3737777f8f0cf2e1737d01a48033a7615b2a > committer: Sergey Vojtovich > timestamp: 2015-11-04 20:37:16 +0400 > message: > > MDEV-9080 - Debian: incorrect empty password check in postinst > > There was code that was supposed to "catch upgrades from previous versions where > the root password wasn't set". But it is wrong in many regards: > - it is supposed to be executed against running server, but at this point server > should be down, which makes this code no-op > - if the above is fixed, root password will be requested twice (initial root > password request + this one) > - it asks for a password only once, while "initial root password request" asks > twice (password + password verification) > - it may give false positive if unix socket based authentication is in effect > > Removed this code since it didn't work for quite a while (at least since > mysql-5.1) and nobody cared about it. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] dc40d73: MDEV-8437 - plugin variables conflict with bootstrap
by Sergei Golubchik 05 Nov '15

05 Nov '15

Hi, Sergey! On Nov 03, Sergey Vojtovich wrote: > revision-id: dc40d737d4af3cb0e272c58507ad54e4eb24be28 (mariadb-10.1.8-22-gdc40d73) > parent(s): a574407444fc3ea93ca88afa93dc18154251bf74 > committer: Sergey Vojtovich > timestamp: 2015-11-03 12:08:23 +0400 > message: > > MDEV-8437 - plugin variables conflict with bootstrap ok to push > Removed redundant attempt to create mysql.plugin table: > - original code was supposed to INSTALL some plugins: > INSERT INTO plugin VALUES ('innodb', 'ha_innodb.so'), > ('federated', 'ha_federated.so'), ('blackhole', 'ha_blackhole.so'), > ('archive', 'ha_archive.so'); I didn't see any INSERT's in the postinst script. > - original code was supposed to fail if mysql.plugin exists: > The query sequence is supposed to be aborted if the CREATE TABLE fails due > to an already existent table in which case the admin might already have > chosen to remove one or more plugins. > - mysql.plugin must've been created by preceeding mysql_install_db anyway > Regards, Sergei

2 1

Re: [Maria-developers] [Commits] 4685c90: mariadb@.service.in should be configured for all systemd platforms.
by Sergey Vojtovich 05 Nov '15

05 Nov '15

Hi Nirbhay, taking into account that CPackRPM won't be able to install it, what's the purpose of having this configured for all systemd platforms? Regards, Sergey On Tue, Nov 03, 2015 at 05:38:12PM -0500, Nirbhay Choubey wrote: > revision-id: 4685c903bc822596bcf12cbfdb5bcc4460ed0105 > parent(s): 95289e5b665d6a3e37f938d0db978d0d0166e493 > committer: Nirbhay Choubey > branch nick: 10.1 > timestamp: 2015-11-03 17:38:11 -0500 > message: > > mariadb@.service.in should be configured for all systemd platforms. > > --- > support-files/CMakeLists.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt > index 2ab4350..2929db1 100644 > --- a/support-files/CMakeLists.txt > +++ b/support-files/CMakeLists.txt > @@ -79,9 +79,9 @@ IF(UNIX) > IF(HAVE_SYSTEMD) > CONFIGURE_FILE(mariadb.service.in > ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service @ONLY) > + CONFIGURE_FILE(mariadb@.service.in > + ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) > IF(NOT RPM) > - CONFIGURE_FILE(mariadb@.service.in > - ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service @ONLY) > INSTALL(FILES use_galera_new_cluster.conf > ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service > ${CMAKE_CURRENT_BINARY_DIR}/mariadb@.service > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

2 2

[Maria-developers] write_set.diff review
by Sergei Golubchik 04 Nov '15

04 Nov '15

Hi, Summary: 1. Three questions (are you sure, what guarantee, why) 2. A couple of suggestions (spilt a commit, move function call out of DBUG_RETURN) 3. Two suggestions for unrelated optimizations (don't allocate unneded bitmaps, don't modify read_set) > commit 2734eca05d499bcbcaf428d04d4f1acbb298589f > Author: Monty <monty(a)mariadb.org> > Date: Mon Nov 2 11:52:06 2015 +0200 > > diff --git a/sql/table.h b/sql/table.h > index b150e4f..6ecfdef 100644 > --- a/sql/table.h > +++ b/sql/table.h > @@ -1066,9 +1066,11 @@ struct TABLE > String alias; /* alias or table name */ > uchar *null_flags; > MY_BITMAP def_read_set, def_write_set, def_vcol_set, tmp_set; > + MY_BITMAP def_rpl_write_set; I would rather not allocate more bitmaps directly in the TABLE. They are not always needed, and only increase the TABLE size. The same is true for def_vcol_set, in fact, it's *even more true* for vcols. Instead I'd allocate them in the TABLE's memroot as needed. > MY_BITMAP eq_join_set; /* used to mark equi-joined fields */ > MY_BITMAP cond_set; /* used to mark fields from sargable conditions*/ > - MY_BITMAP *read_set, *write_set, *vcol_set; /* Active column sets */ > + /* Active column sets */ > + MY_BITMAP *read_set, *write_set, *vcol_set, *rpl_write_set; > /* > The ID of the query that opened and is using this table. Has different > meanings depending on the table type. > diff --git a/sql/table.cc b/sql/table.cc > index 76cb4b8..8816ee0 100644 > --- a/sql/table.cc > +++ b/sql/table.cc > @@ -2884,20 +2884,28 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share, > /* Allocate bitmaps */ > > bitmap_size= share->column_bitmap_size; > - if (!(bitmaps= (uchar*) alloc_root(&outparam->mem_root, bitmap_size*6))) > + if (!(bitmaps= (uchar*) alloc_root(&outparam->mem_root, bitmap_size*7))) > goto err; > my_bitmap_init(&outparam->def_read_set, > (my_bitmap_map*) bitmaps, share->fields, FALSE); > my_bitmap_init(&outparam->def_write_set, > - (my_bitmap_map*) (bitmaps+bitmap_size), share->fields, FALSE); > + (my_bitmap_map*) (bitmaps+bitmap_size), share->fields, > + FALSE); > my_bitmap_init(&outparam->def_vcol_set, > - (my_bitmap_map*) (bitmaps+bitmap_size*2), share->fields, FALSE); > + (my_bitmap_map*) (bitmaps+bitmap_size*2), share->fields, > + FALSE); This is totally wasted memory if the table has no virtual columns. (that's what I meant by *even more true* - rpl bitmap and eq_join_set, cond_set bitmaps may or may not be used for this table, one never knows. But for vcols it's always known in advance whether the table has them or not). Still, I'd allocate other bitmaps on demand too. > my_bitmap_init(&outparam->tmp_set, > - (my_bitmap_map*) (bitmaps+bitmap_size*3), share->fields, FALSE); > + (my_bitmap_map*) (bitmaps+bitmap_size*3), share->fields, > + FALSE); > my_bitmap_init(&outparam->eq_join_set, > - (my_bitmap_map*) (bitmaps+bitmap_size*4), share->fields, FALSE); > + (my_bitmap_map*) (bitmaps+bitmap_size*4), share->fields, > + FALSE); > my_bitmap_init(&outparam->cond_set, > - (my_bitmap_map*) (bitmaps+bitmap_size*5), share->fields, FALSE); > + (my_bitmap_map*) (bitmaps+bitmap_size*5), share->fields, > + FALSE); > + my_bitmap_init(&outparam->def_rpl_write_set, > + (my_bitmap_map*) (bitmaps+bitmap_size*6), share->fields, > + FALSE); > outparam->default_column_bitmaps(); > > outparam->cond_selectivity= 1.0; > @@ -5986,36 +5997,48 @@ void TABLE::mark_columns_needed_for_insert() > we only want to log a PK and we needed other fields for > execution). > */ > + > void TABLE::mark_columns_per_binlog_row_image() > { > + THD *thd= in_use; > DBUG_ENTER("mark_columns_per_binlog_row_image"); > DBUG_ASSERT(read_set->bitmap); > DBUG_ASSERT(write_set->bitmap); > > - THD *thd= current_thd; Hmm. Are you sure that TABLE::in_use is *always* set at this point? You've basically replaced - THD *thd=current_thd; - if (in_use && in_use->is_current_stmt_binlog_format_row) + THD *thd=in_use; + if (thd->is_current_stmt_binlog_format_row) And, btw, where's your MDEV for caching rbr checks per statement? > + /* If not using row format */ > + rpl_write_set= write_set; > > /** > If in RBR we may need to mark some extra columns, > depending on the binlog-row-image command line argument. > */ > if ((WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()) && > - in_use && > - in_use->is_current_stmt_binlog_format_row() && > + thd->is_current_stmt_binlog_format_row() && > !ha_check_storage_engine_flag(s->db_type(), HTON_NO_BINLOG_ROW_OPT)) > { > /* if there is no PK, then mark all columns for the BI. */ > if (s->primary_key >= MAX_KEY) > + { > bitmap_set_all(read_set); > + rpl_write_set= read_set; > + } > + else > + { > switch (thd->variables.binlog_row_image) { > case BINLOG_ROW_IMAGE_FULL: > - if (s->primary_key < MAX_KEY) > bitmap_set_all(read_set); > - bitmap_set_all(write_set); > + /* Set of columns that should be written (all) */ > + rpl_write_set= read_set; > break; > case BINLOG_ROW_IMAGE_NOBLOB: > - /* for every field that is not set, mark it unless it is a blob */ > + /* Only write changed columns + not blobs */ > + rpl_write_set= &def_rpl_write_set; > + bitmap_copy(rpl_write_set, write_set); > + > + /* > + for every field that is not set, mark it unless it is a blob or > + part of a primary key > + */ > for (Field **ptr=field ; *ptr ; ptr++) > { > Field *my_field= *ptr; > @@ -6027,23 +6050,24 @@ void TABLE::mark_columns_per_binlog_row_image() > If set in the AI, then the blob is really needed, there is > nothing we can do about it. > */ > - if ((s->primary_key < MAX_KEY) && > - ((my_field->flags & PRI_KEY_FLAG) || > - (my_field->type() != MYSQL_TYPE_BLOB))) > + if ((my_field->flags & PRI_KEY_FLAG) || > + (my_field->type() != MYSQL_TYPE_BLOB)) > + { > bitmap_set_bit(read_set, my_field->field_index); > - > - if (my_field->type() != MYSQL_TYPE_BLOB) > - bitmap_set_bit(write_set, my_field->field_index); > + bitmap_set_bit(rpl_write_set, my_field->field_index); > } > + } > break; > case BINLOG_ROW_IMAGE_MINIMAL: > - /* mark the primary key if available in the read_set */ > - if (s->primary_key < MAX_KEY) > + /* mark the primary key */ > mark_columns_used_by_index_no_reset(s->primary_key, read_set); > + /* Only write columns that have changed */ > + rpl_write_set= write_set; Where's the guarantee that the primary key is in the write set? > break; > > default: > DBUG_ASSERT(FALSE); > + } > } > file->column_bitmaps_signal(); > } > diff --git a/sql/opt_range.cc b/sql/opt_range.cc > index 860426c..6201065 100644 > --- a/sql/opt_range.cc > +++ b/sql/opt_range.cc > @@ -11140,26 +11138,21 @@ int QUICK_RANGE_SELECT::reset() > int QUICK_RANGE_SELECT::get_next() > { > range_id_t dummy; > + int result; > + DBUG_ENTER("QUICK_RANGE_SELECT::get_next"); > + > + if (!in_ror_merged_scan) > + DBUG_RETURN(file->multi_range_read_next(&dummy)); please don't put function calls inside DBUG_RETURN, always use a variable to store the return value first > + > MY_BITMAP * const save_read_set= head->read_set; > MY_BITMAP * const save_write_set= head->write_set; > - > - DBUG_ENTER("QUICK_RANGE_SELECT::get_next"); > - if (in_ror_merged_scan) > - { > /* > We don't need to signal the bitmap change as the bitmap is always the > same for this head->file > */ > head->column_bitmaps_set_no_signal(&column_bitmap, &column_bitmap); > - } > - > - int result= file->multi_range_read_next(&dummy); > + result= file->multi_range_read_next(&dummy); > - > - if (in_ror_merged_scan) > - { > - /* Restore bitmaps set on entry */ > head->column_bitmaps_set_no_signal(save_read_set, save_write_set); > - } > DBUG_RETURN(result); > } Ok, all changes in opt_range.cc are unrelated to your rpl_write_set patch, please commit them separately > diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc > index ee222f0..208b2b6 100644 > --- a/sql/rpl_record.cc > +++ b/sql/rpl_record.cc > @@ -434,7 +433,7 @@ unpack_row(rpl_group_info *rgi, > *master_reclength = table->s->reclength; > } > > - DBUG_RETURN(error); > + DBUG_RETURN(0); > } > > /** also unrelated to rpl_write_set. If you'd like you can put it in the same commit with opt_range.cc changes, with the sybject "cleanups" or something > diff --git a/sql/sql_class.cc b/sql/sql_class.cc > index 5054357..b238e89 100644 > --- a/sql/sql_class.cc > +++ b/sql/sql_class.cc > @@ -6259,11 +6248,11 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans, > DBUG_ASSERT(is_current_stmt_binlog_format_row() && > ((WSREP(this) && wsrep_emulate_bin_log) || mysql_bin_log.is_open())); > /** > - Save a reference to the original read and write set bitmaps. > - We will need this to restore the bitmaps at the end. > + Save a reference to the original read bitmaps > + We will need this to restore the bitmaps at the end as > + binlog_prepare_row_images() may changetable->read_set. > */ This doesn't make much sense. Here, the code is like that THD::binlog_delete_row: save table->read_set THD::binlog_prepare_row_images calculate table->tmp_set table->read_set=table->tmp_set pack_row(table->read_set) for every set bit in the set_arg call field->pack() restore table->read_set So, two thoughts here: 1. tmp_set must be a strict subset of read_set! other fields may not be present in the record[0] and there're no row reads between binlog_prepare_row_images and field->pack 2. One can pass table->tmp_set directly into pack_row() as an argument which means there's no need for binlog_prepare_row_images to modify table->read_set at all > MY_BITMAP *old_read_set= table->read_set; > - MY_BITMAP *old_write_set= table->write_set; > > /** > This will remove spurious fields required during execution but > diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc > index 488826a..0661e70 100644 > --- a/sql/sql_insert.cc > +++ b/sql/sql_insert.cc > @@ -2867,5 +2867,7 @@ pthread_handler_t handle_delayed_insert(void *arg) > /* Tell client that the thread is initialized */ > mysql_cond_signal(&di->cond_client); > > + di->table->mark_columns_needed_for_insert(); why? > + > /* Now wait until we get an insert or lock to handle */ > /* We will not abort as long as a client thread uses this thread */ Regards, Sergei

1 0

[Maria-developers] Python Storage Engine
by Kim Ebert 02 Nov '15

02 Nov '15

Greetings All, I wanted to share the beginnings of a project. This is a Python Storage Engine. The idea is to plumb in the necessary C to Python calls to allow a storage engine to be written in Python instead of C or C++. This may be valuable to those who want to prototype a database engine in Python, or if the performance is sufficient for the use case, for production. I haven't taken things to far yet, but I think it gives a rough idea of how to move forward with adding the other calls. In my particular case I'm using it to prototype connecting to a search API, like Solr, to provide an SQL like interface. I did have a quick question. I want to license it as a more permissive license, but since I'm using the example engine, does that mean that I need to use the GPL license? Or can I go with the more permissive MIT-new license? https://github.com/perfectsearch/mariadb-plugin-python-engine Thoughts and/or feedback are/is appreciated. Thanks, Kim

3 2

Re: [Maria-developers] MDEV-8692 prefschema test failures on ARM (on Debian build system)
by Sergei Golubchik 28 Oct '15

28 Oct '15

Hi, Alexander! On Oct 23, Alexander Barkov wrote: > Hi, > > - the variant with MY_PERF_CYCLES generally works, but does not fix the > test failure. What do you mean by that? How does it "work" if it does not fix the test failure? > - the variant with MY_CLOCK_REALTIME_FOR_CYCLES works fine > and fixed the problem. > > But it's not really "CYCLES". Perhaps this is not a problem, > because on some other platforms we also fallback cycles to nanoseconds, That commit 49667f0 falls back from cycles to nanoseconds explicitly. So it's ok not to support cycles, as far as I understand, and there's no need to do nanoseconds in place of cycles like your MY_CLOCK_REALTIME_FOR_CYCLES. By the way, why 49667f0 didn't fix the problem? What happens on ARMv7 - no 'cycles' timer at all in perfschema, or there is one and it works incorrectly? > diff --git a/mysql-test/suite/perfschema/t/func_file_io.test b/mysql-test/suite/perfschema/t/func_file_io.test > index 2055fa9..5894cb0 100644 > --- a/mysql-test/suite/perfschema/t/func_file_io.test > +++ b/mysql-test/suite/perfschema/t/func_file_io.test > @@ -43,6 +43,11 @@ TRUNCATE TABLE performance_schema.events_waits_current; > > SELECT * FROM t1 WHERE id = 1; > > +--vertical_results > +SELECT * FROM performance_schema.events_waits_history_long > +WHERE EVENT_NAME = 'wait/io/file/myisam/dfile'; > +--horizontal_results forgotten debug output? > + > SET @before_count = (SELECT SUM(TIMER_WAIT) > FROM performance_schema.events_waits_history_long > WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') > diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c > index 028c7f8..a5ed808 100644 > --- a/mysys/my_rdtsc.c > +++ b/mysys/my_rdtsc.c > @@ -533,6 +590,10 @@ void my_timer_init(MY_TIMER_INFO *mti) > mti->cycles.routine= MY_TIMER_ROUTINE_ASM_GCC_SPARC32; > #elif defined(__sgi) && defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) > mti->cycles.routine= MY_TIMER_ROUTINE_SGI_CYCLE; > +#elif defined(MY_CLOCK_REALTIME_FOR_CYCLES) > + mti->cycles.routine= MY_TIMER_ROUTINE_CLOCK_GETTIME; > +#elif defined(MY_PERF_CYCLES) > + mti->cycles.routine= MY_TIMER_ROUTINE_SGI_CYCLE; I'd say that if we'll have it pushed, you'll need to add a dedicated MY_TIMER_ROUTINE_xxx for this, not reuse MY_TIMER_ROUTINE_SGI_CYCLE. > #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) > mti->cycles.routine= MY_TIMER_ROUTINE_GETHRTIME; > #else Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 72bb358: MDEV-7930 Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type != 2' failed in handler::ha_index_read_map
by Sergey Petrunia 27 Oct '15

27 Oct '15

Hi Sanja, Please find some cosmetic feedback below. Ok to push after it has been addressed. On Mon, Oct 26, 2015 at 05:00:34PM +0100, sanja(a)mariadb.com wrote: > revision-id: 72bb358c2ba98e6e0d4a15b92af514a45751fe8d (mariadb-10.0.21-44-g72bb358) > parent(s): 18f7dfed179204dcfc02a27790e22bb9cc4e2e32 > committer: Oleksandr Byelkin > timestamp: 2015-10-26 16:59:40 +0100 > message: > > MDEV-7930 Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type != 2' failed in handler::ha_index_read_map > > In optimizing aggregate function do not try to touch tables from outer > query. > ... > diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc > index fc3ce09..ad29229 100644 > --- a/sql/opt_sum.cc > +++ b/sql/opt_sum.cc > @@ -341,7 +341,8 @@ int opt_sum_query(THD *thd, > there are no outer joins. > */ > if (!conds && !((Item_sum_count*) item)->get_arg(0)->maybe_null && > - !outer_tables && maybe_exact_count) > + !outer_tables && maybe_exact_count && > + ((item->used_tables() & OUTER_REF_TABLE_BIT) == 0)) > { > if (!is_exact_count) > { > @@ -369,7 +370,8 @@ int opt_sum_query(THD *thd, > indexes to find the key. > */ > Item *expr=item_sum->get_arg(0); > - if (expr->real_item()->type() == Item::FIELD_ITEM) > + if (((expr->used_tables() & OUTER_REF_TABLE_BIT) == 0) && > + expr->real_item()->type() == Item::FIELD_ITEM) > { > uchar key_buff[MAX_KEY_LENGTH]; > TABLE_REF ref; > @@ -394,16 +396,20 @@ int opt_sum_query(THD *thd, > const_result= 0; > break; > } > + /* > + Constant table is already read and the only row is the max > + and the min > + */ I think this comment is not relevant anymore? It's part of the first variant of the fix, which is no longer in the patch. Please remove it. > if (!(error= table->file->ha_index_init((uint) ref.key, 1))) > - error= (is_max ? > + error= (is_max ? > get_index_max_value(table, &ref, range_fl) : > get_index_min_value(table, &ref, item_field, range_fl, > prefix_len)); > > /* Verify that the read tuple indeed matches the search key */ > - if (!error && reckey_in_range(is_max, &ref, item_field->field, > - conds, range_fl, prefix_len)) > - error= HA_ERR_KEY_NOT_FOUND; > + if (!error && reckey_in_range(is_max, &ref, item_field->field, > + conds, range_fl, prefix_len)) > + error= HA_ERR_KEY_NOT_FOUND; These are just endspace changes. Can you remove them? > table->disable_keyread(); > table->file->ha_index_end(); > if (error) > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Several CVE's in Oracle MySQL, is MariaDB vulnerable?
by Christian Rebischke 26 Oct '15

26 Oct '15

Hello everyone, Sorry when I am on the wrong mailinglist. I wanted to submit a bugreport or issue for this but I can't signup for your JIRA because of license reasons. I am from the Archlinux-Security Team and want to ask if mariadb in the actual version is vulnerable to the following CVEs: CVE-2015-4913 CVE-2015-4910 CVE-2015-4905 CVE-2015-4904 CVE-2015-4895 CVE-2015-4890 CVE-2015-4879 CVE-2015-4870 CVE-2015-4862 CVE-2015-4864 CVE-2015-4861 CVE-2015-4858 CVE-2015-4836 CVE-2015-4833 CVE-2015-4830 CVE-2015-4826 CVE-2015-4819 CVE-2015-4815 CVE-2015-4807 CVE-2015-4802 CVE-2015-4800 CVE-2015-4792 CVE-2015-4791 CVE-2015-4766 I hope you can help me. Best regards -------------------------------------------------------------- Christian Rebischke Member of Archlinux CVE-Monitoring Team Website : www.nullday.de Twitter : @sh1bumi Jabber : shibumi(a)jabber.ccc.de PGP : 0xDFE2060D Fingerprint: 6DAF 7B80 8F9D F251 3962 0000 D214 61E3 DFE2 060D --------------------------------------------------------------

4 13

[Maria-developers] crosscompiling in buildroot: cannot find -laio and other link error
by Sylvain Raybaud 23 Oct '15

23 Oct '15

Hi I'm trying to get the latest version of mariadb-galera (10.0.21) into buildroot. I'm running into two errors which I have a feeling are related. But I may be wrong. These problems arise during the build of the host variant of the package. I get the two following errors (build does not stop at the first one because they happen in parallel jobs): 1: Linking CXX shared module ha_connect.so /home/sylvain/git/br/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libxml2.so: error adding symbols: File in wrong format --> for host variant ha_connect.so should be linked against /home/sylvain/git/br/output/host/usr/lib/libxml2.so 2: Linking CXX shared module ha_innodb.so /usr/bin/ld: cannot find -laio The thing is, libaio and libxml2 are both present in /home/sylvain/git/br/output/host/usr/lib/. The link command present in storage/connect/CMakeFiles/connect.dir/link.txt (http://pastebin.com/Qn1ZCw2X) contains: /home/sylvain/git/br/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libxml2.so which is incorrect, should be: /home/sylvain/git/br/output/host/usr/lib/libxml2.so The link command present in storage/innobase/CMakeFiles/innobase.dir/link.txt (http://pastebin.com/it6W9WVs) does not contain -L/home/sylvain/git/br/output/host/usr/lib/. I think it should. At least, when I manually run this command adding -L/home/sylvain/git/br/output/host/usr/lib, it works. I'm really not sure how these link.txt are generated. I checked connect/CMakeLists.txt and innobase/CMakeLists.txt and could not find anything obvious problem. Beside, toplevel CMakeCache.txt does contain: CMAKE_EXE_LINKER_FLAGS:STRING=-L/home/sylvain/git/br/output/host/lib -L/home/sylvain/git/br/output/host/usr/lib -Wl,-rpath,/home/sylvain/git/br/output/host/usr/lib which seems correct. I don't know why this setting does not reach storage/innobase and I'm also not sure why ha_connect.so tries to link against target variant of libxml2. It basically comes down to have cmake look for shared libraries in the right place, but I don't seem to be able to determine which lever to pull. Any hint as to how to achieve that is therefore welcome. Cheers, -- Sylvain Raybaud www.green-communications.fr

2 7

[Maria-developers] innodb holepunch compression vs the filesystem
by MARK CALLAGHAN 21 Oct '15

21 Oct '15

InnoDB punch-hole compression is very bad for a filesystem when done on every (or most) page writes. That feature was not designed to be used in that manner and generates far too much in-memory metadata in the filesystem. If nothing else it leads to multi-minute unlink() system calls. Yet both MariaDB and MySQL proudly exclaim this as a feature. Are you going to use the same kludge as MySQL (do unlink() in a background thread) to avoid locking up InnoDB for many minutes during drop table, maybe leading to InnoDB killing mysqld process? Why didn't you catch this problem via testing or reading my blog posts? https://mariadb.com/kb/en/mariadb/compression/ https://blog.mariadb.org/mariadb-10-1-is-stable-ga/ https://bugs.mysql.com/bug.php?id=78277 http://smalldatum.blogspot.com/2015/08/first-day-with-innodb-transparent-pa… http://smalldatum.blogspot.com/2015/09/second-day-with-innodb-transparent-p… http://smalldatum.blogspot.com/2015/09/third-day-with-innodb-transparent-pa… http://smalldatum.blogspot.com/2015/10/wanted-file-system-on-which-innodb.h… -- Mark Callaghan mdcallag(a)gmail.com

2 1

Re: [Maria-developers] Deadlock in Parallel Replication with FLUSH TABLE WITH READ LOCK.
by Kristian Nielsen 20 Oct '15

20 Oct '15

> I enabled // replication on the slave that has MyISAM tables. > The first results are good, but I ended up with what looks like a deadlock. > I opened support # 10289 for "Deadlock in Parallel Replication with > FLUSH TABLE WITH READ LOCK". There is a patch for this: https://lists.launchpad.net/maria-developers/msg08675.html But no reply on the review request so far. - Kristian.

1 0

[Maria-developers] Code review process
by Otto Kekäläinen 19 Oct '15

19 Oct '15

Hello! During the developer meetup there was a discussion about Gerrit. OpenStack has quite a nice documentation how to contribute, including the git review command and gerrit workflow: http://docs.openstack.org/infra/manual/developers.html -- Otto Kekäläinen MariaDB Foundation

1 0

Re: [Maria-developers] [Maria-discuss] Moving from Launchpad lists to something else... ?
by Tom Worster 19 Oct '15

19 Oct '15

On 10/15/15, 5:03 AM, "Maria-discuss on behalf of Colin Charles" <maria-discuss-bounces+fsb=thefsb.org(a)lists.launchpad.net on behalf of colin(a)mariadb.org> wrote: >> On 15 Oct 2015, at 05:35, Jean Weisbuch <jean(a)phpnet.org> wrote: >> >> To be able to give the best answer we must first know what is >>motivating the move from LP. > >So the reason we were thinking of ditching launchpad for mailing lists: >1. When there was a MariaDB-Manager google group, that group got a lot of >user posts about MariaDB Server. That group now no longer exists, but it >gave us a hint that people are interested in a Google group > >2. We moved everything from Launchpad (bugs to Jira, code to Github) and >the only thing remaining is mailing lists > >3. The MariaDB Knowledgebase: https://mariadb.com/kb/en/ used to have an >OpenID login that would be useful if you had a LP account, but OpenID is >apparently going away (or gone), so there’s less use for LP > >4. LaunchPad itself seems to be “hard” for people to signup (see #1). Good points. Making it easy for people to get involved is important, but if that's the idea then moving to Google Groups isn't a great solution. Apart from it being old and clunky owing to Google's neglect, the insurmountable problem is that it's still an email list at core. Personally, I like email lists best but I'm very old and have been in computing since the 70s, and I accept that most of the rest of the world has moved on. Another problem the Maria community might consider together with the discuss email list is the low quality and participation in the web Q&A of the Knowledge Base. That sometimes makes me sad. There is now a decent open-source system that can function as email list replacement and provide web and mobile Q&A, as well as other stuff: https://www.discourse.org I've used it at New Relic and it seems pretty good. It's got a lot of good stuff and I want to highlight just two. 1. "Mailing List Support - Opt into a special mode where all messages are sent to you via email, exactly like a mailing list. Start new topics via email." 2. You can host it yourself or pay someone you trust to do so. It's not a "free" cloud service where you pay by feeding the internet advertising/surveillance economy. I don't know if Discourse is right for Maria but I wouldn't mention it if I didn't think it might help build a bigger and more active support community, which I long for. Tom

2 1

[Maria-developers] JSON in MariaDB 10.2
by Colin Charles 14 Oct '15

14 Oct '15

Hi all, We just had a session here at the MariaDB Server developer’s meeting in Amsterdam on JSON in MariaDB 10.2. Before forgetting while things are still fresh in the mind, here are the notes from it (in Markdown format). cheers, -colin # JSON in MariaDB * Virtual columns with functional indexes (i.e. generated columns like in 5.7) can be implemented in 2-3 weeks (Sergei) * Eric: Concern about using non-standard function names (functions in 5.7 are `JSN_INSERT` whereas the standard uses `JSON_QUERY`) * Suggestion: Use standard names when available, create UDF to match MySQL names that can be loaded as desired. (or vice versa -- do what MySQL 5.7 does and have UDFs to follow the standard) * Come up with Usable JSON Test suite * Employee DB in JSON? * Good tests exist in DocStore (from the 5.6 facebook tree) * Monty believes we should have more strictly typed (DocStore for example says `unique key doc_c(doc.address.zipcode as int, c)`). Monty thinks it should be optional to keep compatibility with 5.7. This is also similar to the JSON proposed standard (where you have to choose between lax or strict mode) * Colin: Might want to convert JSON document to a relational table (This is part of the standard as `JSON_TABLE`) * Colin: Do we support something similar to what FB has or what oracle has? * SergeyP: We need to follow oracle to maintain compatibility. * Colin: We need to do this soon (i.e. since 5.7 is coming and its going to be a problem for 10.1 not having it; so 10.2 needs it as soon as possible). Everyone generally agrees this is a good idea. # References * [SQL SUPPORT FOR JSON](http://jtc1bigdatasg.nist.gov/_workshop/08_SQL_Support_for_JSON_abstr… * [WL#8132: JSON datatype and binary storage format](https://dev.mysql.com/worklog/task/?id=8132) * [WL#7909: Server side JSON functions](https://dev.mysql.com/worklog/task/?id=7909) * [WL#8249: JSON comparator](https://dev.mysql.com/worklog/task/?id=8249) * [WL#8170: Expression analyzer for GC](https://dev.mysql.com/worklog/task/?id=8170) * [WL#8149: B-tree Index Support on non-materialized virtual columns](https://dev.mysql.com/worklog/task/?id=8149) * [WL#8227: Support SEs to create index on virtual generated columns](https://dev.mysql.com/worklog/task/?id=8227) * [WL#8114: Don't store virtual generated columns in database](https://dev.mysql.com/worklog/task/?id=8114) * [JSON Labs Release: Native JSON Data Type and Binary Format](http://mysqlserverteam.com/json-labs-release-native-json-data-type-… * [JSON Labs Release: JSON Functions, Part 1 — Manipulation JSON Data](http://mysqlserverteam.com/json-labs-release-json-functions-part-1-ma… * [JSON Labs Release: JSON Functions, Part 2 — Querying JSON Data](http://mysqlserverteam.com/mysql-5-7-lab-release-json-functions-part-… * [JSON Labs Release: Effective Functional Indexes in InnoDB](http://mysqlserverteam.com/json-labs-release-effective-functional-i… * [11.6 The JSON Data Type](https://dev.mysql.com/doc/refman/5.7/en/json.html) * [DocStore: Document Database for MySQL at Facebook](https://www.percona.com/live/mysql-conference-2015/sites/default/… * [JSON Support in MySQL](https://www.percona.com/live/mysql-conference-2015/sites/default/fil… # Thanks Thanks to Bryan Alsdorf for writing some of the notes during the session -- Colin Charles, Chief Evangelist, MariaDB Corporation blog: http://bytebot.net/blog/ | t: +1-347-903-3201 | Skype: colincharles | Twitter: @bytebot

1 0

Re: [Maria-developers] [Commits] 5f461a9: MDEV-7640: CHANGE MASTER TO doesn't work with prepared statements
by Oleksandr Byelkin 11 Oct '15

11 Oct '15

Hi! On 17.09.15 00:10, Nirbhay Choubey wrote: > revision-id: 5f461a94a5aa2e1a20fa559ca612d96b53201e4e > parent(s): 29ac245dd04c5416d57a90b0ab3c4d08cbc4d723 > committer: Nirbhay Choubey > branch nick: 5.5 > timestamp: 2015-09-16 18:10:06 -0400 > message: > > MDEV-7640: CHANGE MASTER TO doesn't work with prepared statements > > When CHANGE MASTER was executed as a PS, its attributes were wrongly > getting reset toward the end of PREPARE. As a result, the subsequent > executions had no effect. Fixed by making sure that the CHANGE MASTER > attributes are preserved during the lifetime of the PS. It is OK to push but after expanding the comment about what exactly reset in the persistent statement memory (as we agreed) [skip]

1 0

Re: [Maria-developers] [Commits] 06e3c05: MDEV-8842 add group support to pam_user_map module.
by Sergei Golubchik 07 Oct '15

07 Oct '15

Hi, Holyfoot! On Oct 07, holyfoot(a)askmonty.org wrote: > revision-id: 06e3c05f1ad3156b5a3e0a775b07fb13b9ebb1a8 (mariadb-10.1.7-68-g06e3c05) > parent(s): 8afe96f011eb8037a92b4b3aab16118b0771ad50 > committer: Alexey Botchkov > timestamp: 2015-10-07 15:52:26 +0500 > message: > > MDEV-8842 add group support to pam_user_map module. > Added to the pam_user_map module. Great, thanks! Ok to push. I assume you've tested that it still works after all the changes. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 50dc8c0: MDEV-8842 add group support to pam_user_map module.
by Sergei Golubchik 07 Oct '15

07 Oct '15

Hi, Holyfoot! On Oct 07, holyfoot(a)askmonty.org wrote: > revision-id: 50dc8c0e8a27d18a3d75ff43a87975fcd5e0e7f6 (mariadb-10.1.7-67-g50dc8c0) > parent(s): bed4e847950eef50930b44632eea43416e7b37d1 > committer: Alexey Botchkov > timestamp: 2015-10-07 00:51:33 +0500 > message: > > MDEV-8842 add group support to pam_user_map module. > Added to the pam_user_map module. Looks pretty much ok. Just one suggestion: I'd keep groups in the pam_sm_authenticate and passed the pointer down to user_in_group. Indeed, there may many @group entries in the mapping file, seems like a waste do repopulate group array every time. > --- > plugin/auth_pam/mapper/pam_user_map.c | 59 +++++++++++++++++++++++++++++++++-- > 1 file changed, 57 insertions(+), 2 deletions(-) > > diff --git a/plugin/auth_pam/mapper/pam_user_map.c b/plugin/auth_pam/mapper/pam_user_map.c > index e73ab6d..a3008bd 100644 > --- a/plugin/auth_pam/mapper/pam_user_map.c > +++ b/plugin/auth_pam/mapper/pam_user_map.c > @@ -13,22 +13,71 @@ auth required pam_user_map.so > > And create /etc/security/user_map.conf with the desired mapping > in the format: orig_user_name: mapped_user_name > + @user's_group_name: mapped_user_name > ========================================================= > -#comments and emty lines are ignored > +#comments and emtpy lines are ignored > john: jack > bob: admin > top: accounting > +@group_ro: readonly > ========================================================= > > */ > > +#include <stdlib.h> > #include <stdio.h> > #include <syslog.h> > +#include <grp.h> > +#include <pwd.h> > +#include <limits.h> > #include <security/pam_modules.h> > > #define FILENAME "/etc/security/user_map.conf" > #define skip(what) while (*s && (what)) s++ > > +#define GROUP_BUFFER_SIZE 100 > +int user_in_group(const char *user, const char *group) > +{ > + gid_t group_buffer[GROUP_BUFFER_SIZE]; > + gid_t *groups= group_buffer; > + gid_t group_id; > + gid_t user_group_id; > + int ng, i; > + > + { > + struct passwd *pw= getpwnam(user); > + struct group *g= getgrnam(group); > + if (pw == NULL || g == NULL) > + return 0; > + user_group_id= pw->pw_gid; > + group_id= g->gr_gid; > + } > + > + ng= GROUP_BUFFER_SIZE; > + if (getgrouplist(user, user_group_id, groups, &ng) < 0) > + { > + /* The rare case when the user is present in more than */ > + /* GROUP_BUFFER_SIZE groups. */ > + groups= (gid_t *) malloc(ng * sizeof (gid_t)); > + if (!groups) > + return 0; > + > + (void) getgrouplist(user, user_group_id, groups, &ng); > + } > + > + for (i= 0; i < ng; i++) > + { > + if (groups[i] == group_id) > + break; > + } > + > + if (groups != group_buffer) > + free(groups); > + > + return i < ng; > +} > + > + > int pam_sm_authenticate(pam_handle_t *pamh, int flags, > int argc, const char *argv[]) > { > @@ -51,10 +100,14 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, > while (fgets(buf, sizeof(buf), f) != NULL) > { > char *s= buf, *from, *to, *end_from, *end_to; > + int check_group; > + > line++; > > skip(isspace(*s)); > if (*s == '#' || *s == 0) continue; > + if ((check_group= *s == '@')) > + s++; > from= s; > skip(isalnum(*s) || (*s == '_')); > end_from= s; > @@ -67,7 +120,9 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, > if (end_to == to) goto syntax_error; > > *end_from= *end_to= 0; > - if (strcmp(username, from) == 0) > + if (check_group ? > + user_in_group(username, from) : > + (strcmp(username, from) == 0)) > { > pam_err= pam_set_item(pamh, PAM_USER, to); > goto ret; Regards, Sergei

2 1

Re: [Maria-developers] [Commits] c934b5e: MDEV-8842 add group support to pam_user_map module.
by Sergei Golubchik 06 Oct '15

06 Oct '15

Hi, Holyfoot! On Oct 06, holyfoot(a)askmonty.org wrote: > revision-id: c934b5e661b19b7934d1a9af40afc70b727c2273 (mariadb-10.1.7-64-gc934b5e) > parent(s): 90f2c822469a4f88f882ba8974e790f0fb0b2702 > committer: Alexey Botchkov > timestamp: 2015-10-06 14:02:29 +0500 > message: > > MDEV-8842 add group support to pam_user_map module. > Added to the pam_user_map module. Right, thanks. A couple of comments, see below. > diff --git a/plugin/auth_pam/mapper/pam_user_map.c b/plugin/auth_pam/mapper/pam_user_map.c > index e73ab6d..0787b1c 100644 > --- a/plugin/auth_pam/mapper/pam_user_map.c > +++ b/plugin/auth_pam/mapper/pam_user_map.c ... > + /* > + So below we get the buffer of the NGROUPS_MAX size > + which can take 256K on some systems. > + It supposed to be working differently - we'd get > + the 'ng' from the getgrouplist() and alloc the respective > + size, but the problem is a bug in getgrouplist(). > + The glibc 2.3.2 implementation of this function is broken: > + it overwrites memory when the actual number of groups is larger > + than *ngroups. > + */ Forget 2.3.2, use it as it was supposed to be used. Our oldest builder uses glibc-2.5 > + (void) getgrouplist(user, user_group_id, groups, &ng); > + for (i= 0; i < ng; i++) > + { > + struct group *g; > + if ((g= getgrgid(groups[i])) == NULL) > + return 0; > + if (g->gr_gid == group_id) > + return 1; Eh? Why don't you compare group_id with groups[i] directly ? Regards, Sergei

2 1

Re: [Maria-developers] [Commits] 7ea735b: MDEV-8431 Feedback plugin needs an option for http proxy.
by Sergei Golubchik 06 Oct '15

06 Oct '15

Hi, Holyfoot! On Oct 05, holyfoot(a)askmonty.org wrote: > revision-id: 7ea735baa2df4f4577cf951bc69ccf87fd91f436 (mariadb-10.1.7-40-g7ea735b) > parent(s): ba0b6685510f4a271da8d386ff75bfd83d3156c2 > committer: Alexey Botchkov > timestamp: 2015-10-05 14:46:12 +0500 > message: > > MDEV-8431 Feedback plugin needs an option for http proxy. > 'feedback_http_proxy' system variable added to specify the > proxy server as host:port. Not a dynamic one. That's a bit more complex that I thought it'll be, but ok. Still - did you test it? How? Regards, Sergei

2 2

Re: [Maria-developers] [Commits] ee656a4: MDEV-7846: postreview fix
by Sergei Golubchik 06 Oct '15

06 Oct '15

Hi, Sanja! I have no idea how this postreview fix relates to any of my review comments. Let me repeat them again: 1. Add comments 2. Add a test case with row items 3. In your test case - if you remove GROUP BY you get a crash again. This might be a different bug, though. On Aug 05, sanja(a)mariadb.com wrote: > revision-id: ee656a4aabb5ebbe973b7e4c99be83eb5dc8c0ce > parent(s): 9f8a458fb2d07298810bb5d9824ce728017bfb32 > committer: Oleksandr Byelkin > branch nick: server > timestamp: 2015-08-05 11:57:35 +0200 > message: > > MDEV-7846: postreview fix > > diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc > index 29fff8e..e96d1bc 100644 > --- a/sql/item_cmpfunc.cc > +++ b/sql/item_cmpfunc.cc > @@ -1455,12 +1455,13 @@ bool Item_in_optimizer::fix_left(THD *thd, Item **ref) > next execution we need to copy args[1]->left_expr again. > */ > ref0= &(((Item_in_subselect *)args[1])->left_expr); > + args[0]= ((Item_in_subselect *)args[1])->left_expr; > } > if ((!(*ref0)->fixed && (*ref0)->fix_fields(thd, ref0)) || > (!cache && !(cache= Item_cache::get_cache(*ref0)))) > DBUG_RETURN(1); > if (args[0] != (*ref0)) > - current_thd->change_item_tree(args, (*ref0)); > + args[0]= (*ref0); > DBUG_PRINT("info", ("actual fix fields")); Regards, Sergei

2 1

[Maria-developers] Problem in compiling Maria-db
by indiavaibhav vaibhavindia 02 Oct '15

02 Oct '15

Hello everyone, My name is Vaibhav.I am new to programming for open source. I am facing problems in trying to compile Maria-Db.As instructed on the website, I cloned the maria db source and installed all the files required for compilation. However on using cmake,I am getting an error,screenshot of which is attached is with this mail. Can someone please help me out? Thanks, Vaibhav Choudhary

2 3

Re: [Maria-developers] crosscompiling in buildroot: cannot find -laio and other link error
by Sylvain Raybaud 02 Oct '15

02 Oct '15

Ouch. I'm really sorry, I don't know what happend with my mua and why all these mails were sent to the list. Only the last one counts. Sincere apologies :'( On 02/10/15 17:10, Sylvain Raybaud wrote: > Hi Sergei! > > Thanks for your help. > > On 01/10/15 16:16, Sergei Golubchik wrote: >> Why would you build host variant for ha_connect.so with the library >> paths for the target architecture? > I don't actually, I don't know why this happened. > >> How do you invoke cmake? > The Buildroot system takes care of most of the maging. But... > >> Did you check >> https://mariadb.com/kb/en/mariadb/cross-compiling-mariadb/ ? Regards, >> Sergei > Ooops. For some reason I completely missed this page. Building only the > host variant of import_executables target eases cross-compilation a lot > indeed... Appart from that I had figured most of this out, or buildroot > was taking care of it. I still have a remark: I don't think I can > hardcode the value of > > HAVE_IB_GCC_ATOMIC_BUILTINS > > as suggested in https://lists.launchpad.net/maria-discuss/msg02911.html > because if I want this package accepted in buildroot it must > -- Sylvain Raybaud www.green-communications.fr

1 0

[Maria-developers] MariaDB Developer Meeting in Amsterdam Oct 13-15
by Rasmus Johansson 02 Oct '15

02 Oct '15

Hi maria-developers, There will be a MariaDB Developer Meeting taking place in Amsterdam on October 13-15. It would be great to see many of you there. The main focus of the event is as the title implies the development aspect of MariaDB, but also aspects like documentation, infrastructure and other community related topics will have their place in the event. Also MaxScale developers will be present. If you are interested please sign up by joining and rsvping the event's meetup page here: http://www.meetup.com/MariaDB-Developers/events/224068714/ The session backlog and the schedule for the three days are found here: https://docs.google.com/a/skysql.com/spreadsheets/d/17J_Jloc8I33nsEIE1KCZct… You'll notice that the schedule is not fixed and the idea is the following: - Everyone attending the meeting can affect the agenda by adding sessions to the session backlog - Everyone attending can/should vote on the session of interest in the backlog by raising the count in the Votes column Please feel free to suggest new sessions and remember to vote on the ones you think are most interesting (no limitation on how many you vote for). Best regards, Rasmus -- Rasmus Johansson, VP Engineering MariaDB | t: +358 50 499 9589 | Skype: ratzpo

2 2

Re: [Maria-developers] [Commits] 09eb231: MDEV-8762: file_key_management plugin should be disabled by default when linked statically
by Sergei Golubchik 01 Oct '15

01 Oct '15

Hi, Jan! That's not a good idea. It'd mean that installing a plugin is not enough, it must be explicitly enabled. I don't see any reason why one should be forced to do it. I'll comment in the bugreport. On Oct 01, Jan Lindström wrote: > revision-id: 09eb23148830c53e594cfb88dcb31f1b9e42ae5e (mariadb-10.1.7-33-g09eb231) > parent(s): 3a7cee05d6bac27c3c2f51afb8986c1581649bbc > committer: Jan Lindström > timestamp: 2015-10-01 14:27:10 +0300 > message: > > MDEV-8762: file_key_management plugin should be disabled by default when linked statically > > --- > sql/sql_plugin.cc | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc > index 6d8268e..1d2e2d8 100644 > --- a/sql/sql_plugin.cc > +++ b/sql/sql_plugin.cc > @@ -211,6 +211,7 @@ static struct > > /* we disable few other plugins by default */ > ,{ "feedback", PLUGIN_OFF } > + ,{ "file_key_management", PLUGIN_OFF } > }; Regards, Sergei

2 2

[Maria-developers] MDEV-8831: review request
by Nirbhay Choubey 01 Oct '15

01 Oct '15

Hi Jan, Could you please review the attached patch? Thanks, Nirbhay

1 0

[Maria-developers] Groups in PAM plugin.
by Alexey Botchkov 28 Sep '15

28 Sep '15

Hi. I came up with a small program that checks if an Unix user belongs to a group 'wheel'. That can be attached to the 'plugin/auth_pam/mapper/pam_user_map.c' in no time if that's what we want. http://myoffice.izhnet.ru/~af/gr.cc An it must be LDAP-compliant AFAIK. Best regards. HF

1 0

[Maria-developers] New Programmer(Maria-DB)
by indiavaibhav vaibhavindia 28 Sep '15

28 Sep '15

Hello everyone, My name is Vaibhav Choudhary.I am in my second year undergraduation and am new to open source. I would like to contribute to your project.Can anyone please guide me as to how should i work on a patch after i have identified the problem on JIRA? I have a good knowledge of C++ and am studying MySQL.But I am unable to figure out as to how should I go about writing the code for the issues on JIRA. Thanks Vaibhav

2 4

Re: [Maria-developers] [Commits] 1d92131: MDEV-4829 BEFORE INSERT triggers dont issue 1406 error.
by Sergei Golubchik 27 Sep '15

27 Sep '15

Hi, Holyfoot! On Sep 24, holyfoot(a)askmonty.org wrote: > revision-id: 1d92131613770b505fa462b33c1091e00d9475be (mariadb-10.1.7-61-g1d92131) > parent(s): e5418942609833edb681d16c4e2705f8c338bfee > committer: Alexey Botchkov > timestamp: 2015-09-24 14:31:06 +0500 > message: > > MDEV-4829 BEFORE INSERT triggers dont issue 1406 error. > Fixed as it's done in MySQL 5.7. > The Strict_error_handler introduced to intercept such states and is activated > in the sp_head::execute_trigger() Hmm... This is, basically, a new implementation of the strict mode. But enabled only for triggers, which is kind of weird. And potentially very fragile and inconsistent, as it's a strict mode we're talking about, it's confusing and not very consistent on itself. Having two different implementations of it doesn't help to make it clear or consistent. If you're introducing a new implementation - use it consistently everywhere. If that won't change existing intentional behavior. And please talk to Bar about his recent experiences in this area. There were also few comments about the code, see below. > diff --git a/sql/sp_head.cc b/sql/sp_head.cc > index a117963..ff6d2b4 100644 > --- a/sql/sp_head.cc > +++ b/sql/sp_head.cc > @@ -54,6 +54,35 @@ > > #include <my_user.h> > > +/** > + A simple RAII wrapper around Strict_error_handler. > +*/ > +class Strict_error_handler_wrapper > +{ > + THD *m_thd; > + Strict_error_handler m_strict_handler; > + bool m_active; > + > +public: > + Strict_error_handler_wrapper(THD *thd, sp_head *sp_head) > + : m_thd(thd), m_active(false) > + { > + if (sp_head->m_sql_mode & (MODE_STRICT_ALL_TABLES | > + MODE_STRICT_TRANS_TABLES)) > + { > + m_thd->push_internal_handler(&m_strict_handler); > + m_active= true; > + } > + } > + > + ~Strict_error_handler_wrapper() > + { > + if (m_active) > + m_thd->pop_internal_handler(); > + } > +}; Oh, really? A wrapper per handler? Make it a template, please, so that it could be used for any error handler. Like this: Error_handler_wraper<Strict_error_handler> strict_error_handler(thd, this); Also, it would be good if you do a second commit using this wrapper in other places, where appropriate. > @@ -1576,6 +1605,9 @@ sp_head::execute_trigger(THD *thd, > DBUG_ENTER("sp_head::execute_trigger"); > DBUG_PRINT("info", ("trigger %s", m_name.str)); > > + // Push Strict_error_handler if the SP was created in STRICT mode. > + Strict_error_handler_wrapper strict_wrapper(thd, this); > + > #ifndef NO_EMBEDDED_ACCESS_CHECKS > Security_context *save_ctx= NULL; > > diff --git a/sql/sql_base.cc b/sql/sql_base.cc > index 9162969..ca0699c 100644 > --- a/sql/sql_base.cc > +++ b/sql/sql_base.cc > @@ -96,6 +96,74 @@ bool No_such_table_error_handler::safely_trapped_errors() > > > /** > + Implementation of STRICT mode. > + Upgrades a set of given conditions from warning to error. > +*/ > +bool Strict_error_handler::handle_condition_ext(THD *thd, > + uint sql_errno, > + const char *sqlstate, > + Sql_condition::enum_warning_level *level, > + const char *msg, > + Sql_condition **cond_hdl) > +{ > + /* STRICT MODE should affect only the below statements */ Really? > + switch (thd->lex->sql_command) > + { > + case SQLCOM_CREATE_TABLE: > + case SQLCOM_DROP_INDEX: > + case SQLCOM_INSERT: > + case SQLCOM_REPLACE: > + case SQLCOM_REPLACE_SELECT: > + case SQLCOM_INSERT_SELECT: > + case SQLCOM_UPDATE: > + case SQLCOM_UPDATE_MULTI: > + case SQLCOM_DELETE: > + case SQLCOM_DELETE_MULTI: > + case SQLCOM_ALTER_TABLE: > + case SQLCOM_LOAD: > + case SQLCOM_CALL: > + case SQLCOM_END: > + case SQLCOM_SET_OPTION: > + case SQLCOM_SELECT: > + break; > + default: > + return false; > + } > + > + switch (sql_errno) > + { > + case ER_TRUNCATED_WRONG_VALUE: > + case ER_WRONG_VALUE_FOR_TYPE: > + case ER_WARN_DATA_OUT_OF_RANGE: > + case ER_DIVISION_BY_ZERO: > + case ER_TRUNCATED_WRONG_VALUE_FOR_FIELD: > + case WARN_DATA_TRUNCATED: > + case ER_DATA_TOO_LONG: > + case ER_BAD_NULL_ERROR: > + case ER_NO_DEFAULT_FOR_FIELD: > + case ER_TOO_LONG_KEY: > + case ER_WRONG_ARGUMENTS: > + case ER_NO_DEFAULT_FOR_VIEW_FIELD: > + case ER_WARN_NULL_TO_NOTNULL: > + case ER_CUT_VALUE_GROUP_CONCAT: > + case ER_DATETIME_FUNCTION_OVERFLOW: > + case ER_WARN_TOO_FEW_RECORDS: > + if ((*level == Sql_condition::WARN_LEVEL_WARN) && > + thd->transaction.stmt.m_unsafe_rollback_flags == 0 || > + (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)) > + { > + (*level)= Sql_condition::WARN_LEVEL_ERROR; > + thd->killed= KILL_BAD_DATA; > + } > + break; > + default: > + break; > + } > + return false; > +} > + > + > +/** > This internal handler is used to trap ER_NO_SUCH_TABLE and > ER_WRONG_MRG_TABLE errors during CHECK/REPAIR TABLE for MERGE > tables. > diff --git a/sql/sql_base.h b/sql/sql_base.h > index 1c0029d..c5a76c5 100644 > --- a/sql/sql_base.h > +++ b/sql/sql_base.h > @@ -676,5 +676,30 @@ class No_such_table_error_handler : public Internal_error_handler > int m_unhandled_errors; > }; > > +/** > + This internal handler implements upgrade from SL_WARNING to SL_ERROR "SL_ERROR"? "SL_WARNING"? > + for the error codes affected by STRICT mode. Currently STRICT mode does > + not affect SELECT statements. > +*/ > + > +class Strict_error_handler : public Internal_error_handler > +{ > +protected: > + bool handle_condition(THD *thd, > + uint sql_errno, > + const char* sqlstate, > + Sql_condition::enum_warning_level level, > + const char* msg, > + Sql_condition ** cond_hdl) > + { DBUG_ASSERT(FALSE); return 0; } > +public: > + bool handle_condition_ext(THD *thd, > + uint sql_errno, > + const char* sqlstate, > + Sql_condition::enum_warning_level *level, > + const char* msg, > + Sql_condition ** cond_hdl); 1. why not to change handle_condition() ? 2. strict mode may change the sql_errno, handle_condition_ext doesn't support it. > +}; > + > > #endif /* SQL_BASE_INCLUDED */ Regards, Sergei

1 2

Re: [Maria-developers] [Commits] d3f10e3: MDEV-8431 Feedback plugin needs an option for http proxy.
by Sergei Golubchik 26 Sep '15

26 Sep '15

Hi, Holyfoot! On Sep 21, holyfoot(a)askmonty.org wrote: > revision-id: d3f10e30ec39bccf1172c7b2eb159f40e412bdfd (mariadb-10.0.21-14-gd3f10e3) > parent(s): abd31ca2b6cde024772fcac0f4953219d76c6344 > committer: Alexey Botchkov > timestamp: 2015-09-21 14:06:15 +0500 > message: > > MDEV-8431 Feedback plugin needs an option for http proxy. > 'feedback_proxy_server' system variable added to specify the > proxy server. Not a dynamic one. How did you test this feature? > diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc > index f644bd5..f76c52a 100644 > --- a/plugin/feedback/feedback.cc > +++ b/plugin/feedback/feedback.cc > @@ -250,6 +251,9 @@ static int init(void *p) > > prepare_linux_info(); > > + proxy_url= proxy_server ? > + Url::create(proxy_server, strlen(proxy_server)) : 0; Some diagnostics would be nice here. At least "feedback: invalid proxy url: '%.*s'". See how ivalid feedback urls are reported. > + > url_count= 0; > if (*url) > { > @@ -347,6 +354,9 @@ static MYSQL_SYSVAR_ULONG(send_timeout, send_timeout, PLUGIN_VAR_RQCMDARG, > static MYSQL_SYSVAR_ULONG(send_retry_wait, send_retry_wait, PLUGIN_VAR_RQCMDARG, > "Wait this many seconds before retrying a failed send.", > NULL, NULL, 60, 1, 60*60*24, 1); > +static MYSQL_SYSVAR_STR(proxy_server, proxy_server, > + PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG, > + "Proxy server address.", NULL, NULL,0); Mention that it must be an url. "Proxy server URL" or "Proxy server address, in the correct URI format", or something. > static struct st_mysql_sys_var* settings[] = { > MYSQL_SYSVAR(server_uid), > diff --git a/plugin/feedback/url_http.cc b/plugin/feedback/url_http.cc > index f214f7a..eade67c 100644 > --- a/plugin/feedback/url_http.cc > +++ b/plugin/feedback/url_http.cc > @@ -148,9 +148,12 @@ int Url_http::send(const char* data, size_t data_length) > my_socket fd= INVALID_SOCKET; > char buf[1024]; > uint len= 0; > + Url_http *proxy_loc= (Url_http *) proxy_url; > > addrinfo *addrs, *addr, filter= {0, AF_UNSPEC, SOCK_STREAM, 6, 0, 0, 0, 0}; > - int res= getaddrinfo(host.str, port.str, &filter, &addrs); > + int res= proxy_url ? > + getaddrinfo(proxy_loc->host.str, proxy_loc->port.str, &filter, &addrs) : > + getaddrinfo(host.str, port.str, &filter, &addrs); > First, you don't know whether proxy_url is Url_http. It might be easier to have an option --feedback-http-proxy=host:port (not the url). It also solves the potential future confusion if we'll have more than one transport. Second, I don't think proxies work this way at all, for a http proxy, you need to specify the host in th GET request, like POST http://foo.bar/bla/bla So, I think, a better implementation would be to take proxy into account not in Url_http::send(), but already in http_create(). And create Url_http objects for feedback url with proxy's host and port, and with the appropriately adjusted path. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] efcbbed: MDEV-8682 - CSV engine does not properly process "", in quotes
by Sergei Golubchik 26 Sep '15

26 Sep '15

Hi, Sergey! On Sep 22, Sergey Vojtovich wrote: > revision-id: efcbbed977dfcd9ee0ed035cbb0df4404483b0c8 (mariadb-10.1.7-53-gefcbbed) > parent(s): 7cbecadf9b59d06f4d9a9e776f99418b273c2ebc > committer: Sergey Vojtovich > timestamp: 2015-09-22 16:52:30 +0400 > message: > > MDEV-8682 - CSV engine does not properly process "", in quotes > > Added per-table boolean IETF_QUOTES variable to CSV storage engine. It allows to > enable IETF-compatible parsing of embedded quote and comma characters. Disabled > by default. > > This patch is based on Percona revision: > https://github.com/percona/percona-server/commit/b32fbf02766f8db00f9ff4e6dc… > > Note that original patch adds server variable, while this patch adds per-table > variable. I agree that a per-table option is safer. Ok to push. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 5f461a9: MDEV-7640: CHANGE MASTER TO doesn't work with prepared statements
by Kristian Nielsen 21 Sep '15

21 Sep '15

nirbhay(a)mariadb.com (Nirbhay Choubey) writes: > revision-id: 5f461a94a5aa2e1a20fa559ca612d96b53201e4e > parent(s): 29ac245dd04c5416d57a90b0ab3c4d08cbc4d723 > committer: Nirbhay Choubey > branch nick: 5.5 > timestamp: 2015-09-16 18:10:06 -0400 > message: > > MDEV-7640: CHANGE MASTER TO doesn't work with prepared statements > > When CHANGE MASTER was executed as a PS, its attributes were wrongly > getting reset toward the end of PREPARE. As a result, the subsequent > executions had no effect. Fixed by making sure that the CHANGE MASTER > attributes are preserved during the lifetime of the PS. Hm, this MDEV seems now assigned to me, but I did not see any mail from you about it? Did you expect a review? But in any case, this code around prepare/execute is not something I am familiar with. I seem to recall that Sanja worked on several issues related to incorrect prepare/execute, maybe he can have some ideas or suggest a reviewer. Apparently this is something that used to work but started to break sometimes in 5.5. Do you know how the problem was introduced? - Kristian (sadder by the hour over devs not using the mailing list).

2 1

[Maria-developers] Super Read Only in MariaDB (10.1) ?
by Jean-François Gagné 19 Sep '15

19 Sep '15

Hi, a super_read_only option is making its way in MySQL 5.7: * http://www.tocker.ca/2015/07/09/mysql-5-7-8-now-featuring-super_read_only-a… * http://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_… Are there plans to have a similar option in MariaDB (it would be great to have it in MariaDB 10.1) ? Many thanks, -- Jean-François Gagné System Engineer Booking.com BV Rembrandt Square Office Herengracht 597, 1017 CE Amsterdam

2 1

[Maria-developers] New programmer
by Acha Bill 18 Sep '15

18 Sep '15

Hello guys, I'm Acha Bill. Final year undergraduate in Computer Engineering. I would like to be an active contributor to your ongoing projects. I have good knowledge of C/C++ and MySQL. As this is my first approach to open source, any guidance will be much appreciated. Bill.

3 3

Re: [Maria-developers] Please review MDEV-8468 MDEV-8466
by Sergei Golubchik 17 Sep '15

17 Sep '15

Hi, Alexander! On Jul 21, Alexander Barkov wrote: > > I have one question about "HANDLER FOR SQLWARNING". > It does not catch messages of level "Note". > Looks like a bug. Please confirm, I'll file a report if so. Hmm, I don't know. According to the standard, SQLWARNING should match sqlstates in the category W, while SQLEXCEPTION should be for sqlstates in the category X. But we don't do that, 22007 is an exception (category X), but we treat it as a warning. So, the standard doesn't help to answer your question. We seem to use the logic where a level "error" means an SQL exception and a level "warning" means an SQL warning. Using this logic, "notes" are neither exceptions nor warnings, and neither SQLEXCEPTION nor SQLWARNING should match them. I'd say it's not a bug. The patch itself looks great, these changes in behavior are very welcomed. Just one small comment regarding THD::check_edom_and_truncation(), see below. > diff --git a/sql/sql_class.h b/sql/sql_class.h > index a8d8444..c19174b 100644 > --- a/sql/sql_class.h > +++ b/sql/sql_class.h > @@ -3270,6 +3270,53 @@ class THD :public Statement, > (!transaction.stmt.modified_non_trans_table || > (variables.sql_mode & MODE_STRICT_ALL_TABLES))); > } > + /** > + Check string-to-number conversion and produce a warning if > + - could not convert any digits (EDOM-alike error) > + - found garbage at the end of the string > + See also Field_num::check_edom_and_truncation() for a similar function. > + > + @param thd - the thread > + @param type - name of the data type (e.g. "INTEGER", "DECIMAL", "DOUBLE") > + @param edom - of a EDOM-alike error happened > + @param cs - character set of the original string > + @param str - the original string > + @param end_of_num - the position where the string-to-number routine stopped. > + @param end - the end of the string > + > + Unlike Field_num::check_edom_and_truncation(), this function does not > + distinguish between EDOM and truncation and reports the same warning for > + both cases. Perhaps we should eventually print different warnings, to make > + the explicit CAST work closer to the implicit cast in Field_xxx::store(). Why haven't you done it now? It causes too many changes in tests? > + */ > + void check_edom_and_truncation(const char *type, bool edom, > + CHARSET_INFO *cs, > + const char *str, > + const char *end_of_num, > + const char *end) Move this out of THD please. You don't need to call current_thd every time for it, but only when a warning should be issued. > + { > + DBUG_ASSERT(str <= end_of_num); > + DBUG_ASSERT(end_of_num <= end); > + if (edom || > + (end_of_num < end && !check_if_only_end_space(cs, end_of_num, end))) > + { > + /* > + We can use err.ptr() here as ErrConvString is guranteed to put an > + end \0 here. > + */ > + push_warning_printf(this, Sql_condition::WARN_LEVEL_WARN, > + ER_TRUNCATED_WRONG_VALUE, > + ER(ER_TRUNCATED_WRONG_VALUE), type, > + ErrConvString(str, end - str, cs).ptr()); > + } > + else if (end_of_num < end) > + { > + push_warning_printf(this, Sql_condition::WARN_LEVEL_NOTE, > + ER_TRUNCATED_WRONG_VALUE, > + ER(ER_TRUNCATED_WRONG_VALUE), type, > + ErrConvString(str, end - str, cs).ptr()); > + } > + } Regards, Sergei

2 1

[Maria-developers] unsubscribe
by Abdul Hakeem 16 Sep '15

16 Sep '15

1 0

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

16 Sep '15

Hi, Sanja! Looks good, thanks. Ok to push! On Sep 15, sanja(a)mariadb.com wrote: > revision-id: a1f31cfa8d0f04cb166813786f7854db3dbcf715 (mariadb-10.1.6-12-ga1f31cf) > parent(s): 86a3613d4e981c341e38291c9eeec5dc9f836fae > committer: Oleksandr Byelkin > timestamp: 2015-09-15 21:50:28 +0200 > message: > > MDEV-6756: map a linux pid (child pid) to a connection id shown in the > output of SHOW PROCESSLIST > > Added tid (thread ID) for system where it is present. > > ps -eL -o tid,pid,command > > shows the thread on Linux Regards, Sergei

1 0

Re: [Maria-developers] [Commits] 8bf23ef: MDEV-8208: Sporadic SEGFAULT on startup
by Sergei Golubchik 16 Sep '15

16 Sep '15

Hi, Nirbhay! On Aug 19, Nirbhay Choubey wrote: > revision-id: 8bf23efc914f18c687067e9314cadf4f36a85eec > parent(s): 71d1f35847a575239deff856590bf6f13afd74ed > committer: Nirbhay Choubey > branch nick: 5.5-galera.b8208 > timestamp: 2015-08-19 17:17:56 -0400 > message: > > MDEV-8208: Sporadic SEGFAULT on startup A couple of questions: > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index 2008fc5..4c05999 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -4584,6 +4579,29 @@ static int init_server_components() > } > plugins_are_initialized= TRUE; /* Don't separate from init function */ > > +#ifdef WITH_WSREP > + /* Wait for wsrep threads to get created. */ > + if (wsrep_creating_startup_threads == 1) { > + mysql_mutex_lock(&LOCK_thread_count); > + while (wsrep_running_threads < 2) > + { > + mysql_cond_wait(&COND_thread_count, &LOCK_thread_count); > + } > + > + /* Now is the time to initialize threads for queries. */ > + THD *tmp; > + I_List_iterator<THD> it(threads); > + while ((tmp= it++)) > + if (tmp->wsrep_applier == true) > + tmp->init_for_queries(); Do you really need to iterate over all THD's? There is only one applier thread, right? And it's THD is not stored anywhere, only in the global list? > + mysql_mutex_unlock(&LOCK_thread_count); > + } > +#endif > + > have_csv= plugin_status(STRING_WITH_LEN("csv"), > MYSQL_STORAGE_ENGINE_PLUGIN); > have_ndbcluster= plugin_status(STRING_WITH_LEN("ndbcluster"), > @@ -4890,12 +4902,21 @@ pthread_handler_t start_wsrep_THD(void *arg) > //thd->version= refresh_version; > thd->proc_info= 0; > thd->command= COM_SLEEP; > - thd->set_time(); > - thd->init_for_queries(); > + > + if (plugins_are_initialized) > + { > + thd->init_for_queries(); > + } What happens if plugins are not initialized yet? thd->init_for_queries() will be done in that THD loop above? In that case why do you need to do it here? Regards, Sergei

2 2

Re: [Maria-developers] [Commits] 6ed7307: MDEV-8576: Bootstrap should ignore --enforce-storage-engine option
by Sergei Golubchik 16 Sep '15

16 Sep '15

Hi, Jan! On Sep 16, Jan Lindström wrote: > revision-id: 6ed73070e120e1be5456288556019db5bd3f9f60 > parent(s): 6cc1befcf26b2dc43e5cd7ad85d29c576073b1c5 > committer: Jan Lindström > branch nick: 10.1-tests > timestamp: 2015-09-16 11:47:34 +0300 > message: > > MDEV-8576: Bootstrap should ignore --enforce-storage-engine option > > Allow enforce-storage-engine="" option and use that on mysql_install_db > when doing bootstrap. Agree. After I commented on the previous patch it occurred to me that --disable-enforce-storage-engine is a bad idea, because --enable-enforce-storage-engine makes no sense, and one normally expects --enable-xxx for every --disable-xxx. So --enforce-storage-engine="" is a better way of switching this feature off. > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index b45d4e1..ee3b870 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -4843,7 +4843,10 @@ static void add_file_to_crash_report(char *file) > static int init_default_storage_engine_impl(const char *opt_name, > char *engine_name, plugin_ref *res) > { > - if (!engine_name) > + /* Storage engine can be NULL and enforced storage engine > + can be empty. */ > + if (!engine_name || > + (strcmp(opt_name, "enforced_storage_engine") == 0 && strlen(engine_name) == 0)) > { > *res= 0; > return 0; In fact, default_tmp_storage_engine can be NULL too. See in mysqld.cc: if (default_tmp_storage_engine && !*default_tmp_storage_engine) default_tmp_storage_engine= NULL; if (init_default_storage_engine(default_tmp_storage_engine, tmp_table_plugin)) unireg_abort(1); And it looks like it's important to have default_tmp_storage_engine=NULL, not leave it as an empty string. Because Sys_var_plugin::do_check() doesn't allow empty strings as plugins names, but translates NULL to "no plugin". So, you either need to set enforced_storage_engine=NULL if it was an empty string, or you need to fix Sys_var_plugin::do_check() to treat empty strings as "no plugin" too. Regards, Sergei

1 0

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

15 Sep '15

Hi, Sanja! There's an issue with cmake detection and with tests. But the code looks fine, thanks! On Sep 14, sanja(a)mariadb.com wrote: > revision-id: 7f7cbb132fa0a40687e4b25a9c9e163c93ec6d15 (mariadb-10.1.6-12-g7f7cbb1) > parent(s): 86a3613d4e981c341e38291c9eeec5dc9f836fae > committer: Oleksandr Byelkin > timestamp: 2015-09-14 12:47:57 +0200 > message: > > MDEV-6756: map a linux pid (child pid) to a connection id shown in the > output of SHOW PROCESSLIST > > Added tid (thread ID) for system where it is present. > > ps -eL -o tid,pid,command > > shows the thread on Linux > > diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result > index 2a918ad..ef889c7 100644 > --- a/mysql-test/r/information_schema.result > +++ b/mysql-test/r/information_schema.result > @@ -2066,3 +2066,7 @@ Variable_name Value > Opened_tables 3 > drop database mysqltest; > drop database db1; > +set @TID= (SELECT tid FROM information_schema.processlist); > +select (SELECT tid FROM information_schema.processlist) = @TID; > +(SELECT tid FROM information_schema.processlist) = @TID > +1 That seems pretty useless as a test :) > diff --git a/sql/sql_class.cc b/sql/sql_class.cc > index bf161b2..0478b33 100644 > --- a/sql/sql_class.cc > +++ b/sql/sql_class.cc > @@ -69,6 +69,10 @@ > #include "sql_connect.h" > #include "my_atomic.h" > > +#ifdef HAVE_SYS_SYSCALL_H Pardon me? Did you see whether your code actually work? You check here whether HAVE_SYS_SYSCALL_H is defined, but you don't have CHECK_INCLUDE_FILES(sys/syscall.h HAVE_SYS_SYSCALL_H) in configure.cmake and HAVE_SYS_SYSCALL_H in config.h.cmake. So, I don't see how your code can possibly work as HAVE_SYS_SYSCALL_H should be never defined in your patch. Please, when fixing it, make sure that your test *fails* without TID support (I suspect you'll have to enable it only on linux). And then you could remove that useless test above. > +#include <sys/syscall.h> > +#endif Regards, Sergei

2 2

[Maria-developers] MDEV-3929 Add system variable explicit_defaults_for_timestamp for compatibility with MySQL
by Alexander Barkov 15 Sep '15

15 Sep '15

Hi Sergei, Please review a patch that merges a new read-only variables --explicit-defaults-for-timestamp from MySQL. Note, the original MySQL patch updates many tests, to make the tests independent from the compiled-in default --explicit-defaults-for-timestamp value. I guess Oracle is planning to change the default value to ON eventually. I merged these changes for tests as well. As a result, all tests pass in both "mtr" and "mtr --mysqld=--explicit-defaults-for-timestamp", which I think is good. In addition to the original MySQL changes in mtr, I also added two tests that describe specific behavior: sys_vars.explicit_defaults_for_timestamp_off sys_vars.explicit_defaults_for_timestamp_on Note, the patch assumes that the server and the slave have the same --explicit-defaults-for-timeatamp. Monty suggested to make this variable dynamic and replication-safe. We added a separate task for this: MDEV-8455 Make --explicit-defaults-for-timestamp dynamic I plan to do it in the next 10.1 sprint round. Thanks.

2 8

Re: [Maria-developers] [Commits] 8983790: MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING
by Oleksandr Byelkin 14 Sep '15

14 Sep '15

On 14.09.15 21:59, Sergey Petrunia wrote: > Hi Sanja, > > The big comment: I see HAVING being printed for EXPLAIN FORMAT=JSON but not for > ANALYZE FORMAT=JSON. > > For example: > > MariaDB [test]> explain format=json select count(*) from t1 where t1.a between 0 and 1000 group by b having count(*) > 0\G > *************************** 1. row *************************** > EXPLAIN: { > "query_block": { > "select_id": 1, > "having_condition": "(count(0) > 0)", > "filesort": { > "temporary_table": { > "function": "buffer", > "table": { > "table_name": "t1", > "access_type": "ALL", > "rows": 1000, > "filtered": 100, > "attached_condition": "(t1.a between 0 and 1000)" > } > } > } > } > } > > MariaDB [test]> analyze format=json select count(*) from t1 where t1.a between 0 and 1000 group by b having count(*) > 0\G > *************************** 1. row *************************** > ANALYZE: { > "query_block": { > "select_id": 1, > "r_loops": 1, > "r_total_time_ms": 49.417, > "filesort": { > "r_loops": 1, > "r_total_time_ms": 0.4251, > "r_used_priority_queue": false, > "r_output_rows": 101, > "r_buffer_size": "2Kb", > "temporary_table": { > "table": { > "table_name": "t1", > "access_type": "ALL", > "r_loops": 1, > "rows": 1000, > "r_rows": 1000, > "r_total_time_ms": 18.597, > "filtered": 100, > "r_filtered": 100, > "attached_condition": "(t1.a between 0 and 1000)" > } > } > } > } > } oops, I'll fix. > > Smaller comments below. > > On Wed, Sep 09, 2015 at 04:29:54PM +0200, sanja(a)mariadb.com wrote: >> revision-id: 8983790df9a16520e69905fc4c35d20f7c935c3e (mariadb-10.1.6-119-g8983790) >> parent(s): 3fcd84c2891f4d2c881f13b53bc5a2401870b80a >> committer: Oleksandr Byelkin >> timestamp: 2015-09-09 16:29:50 +0200 >> message: >> >> MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING >> >> Printing non-trivial HAVING added. >> >> --- >> mysql-test/r/explain_json.result | 84 ++++++++++++++++++++++++++++++++++++++++ >> mysql-test/t/explain_json.test | 23 ++++++++++- >> sql/sql_explain.cc | 15 ++++++- >> sql/sql_explain.h | 7 +++- >> sql/sql_select.cc | 2 + >> 5 files changed, 128 insertions(+), 3 deletions(-) >> >> diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result >> index 0507cee..db2726d 100644 >> --- a/mysql-test/r/explain_json.result >> +++ b/mysql-test/r/explain_json.result >> @@ -799,6 +799,7 @@ EXPLAIN >> { >> "query_block": { >> "select_id": 2, >> + "having_condition": "trigcond(<is_not_null_test>(t1.a))", >> "full-scan-on-null_key": { >> "table": { >> "table_name": "t1", >> @@ -1070,3 +1071,86 @@ EXPLAIN >> } >> } >> drop table t1; >> +# >> +# MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING >> +# >> +create table t0(a int); >> +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); >> +create table t1(a int); >> +insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C; >> +create table t2 ( >> +a int, >> +b int, >> +key (a) >> +); >> +insert into t2 select A.a*1000 + B.a, A.a*1000 + B.a from t0 A, t1 B; >> +# normal HAVING >> +explain format=json select a, max(b) as TOP from t2 group by a having TOP > a; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "having_condition": "(TOP > t2.a)", >> + "filesort": { >> + "temporary_table": { >> + "function": "buffer", >> + "table": { >> + "table_name": "t2", >> + "access_type": "ALL", >> + "rows": 10000, >> + "filtered": 100 >> + } >> + } >> + } >> + } >> +} >> +# HAVING is always TRUE (not printed) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1<>2; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "filesort": { >> + "temporary_table": { >> + "function": "buffer", >> + "table": { >> + "table_name": "t2", >> + "access_type": "ALL", >> + "rows": 10000, >> + "filtered": 100 >> + } >> + } >> + } >> + } >> +} >> +# HAVING is always FALSE (intercepted by message) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1=2; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "table": { >> + "message": "Impossible HAVING" >> + } >> + } >> +} >> +# HAVING is absent >> +explain format=json select a, max(b) as TOP from t2 group by a; >> +EXPLAIN >> +{ >> + "query_block": { >> + "select_id": 1, >> + "filesort": { >> + "temporary_table": { >> + "function": "buffer", >> + "table": { >> + "table_name": "t2", >> + "access_type": "ALL", >> + "rows": 10000, >> + "filtered": 100 >> + } >> + } >> + } >> + } >> +} >> +drop table t0, t1, t2; >> diff --git a/mysql-test/t/explain_json.test b/mysql-test/t/explain_json.test >> index 3e6f34b..0870817 100644 >> --- a/mysql-test/t/explain_json.test >> +++ b/mysql-test/t/explain_json.test >> @@ -278,4 +278,25 @@ explain format=json select count(distinct a1,a2,b,c) from t1 where (a2 >= 'b') a >> >> drop table t1; >> >> - >> +--echo # >> +--echo # MDEV-7970: EXPLAIN FORMAT=JSON does not print HAVING >> +--echo # >> +create table t0(a int); >> +insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); >> +create table t1(a int); >> +insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C; >> +create table t2 ( >> + a int, >> + b int, >> + key (a) >> +); >> +insert into t2 select A.a*1000 + B.a, A.a*1000 + B.a from t0 A, t1 B; > This seems to be excessive. I don't see any examples using key(a), I don't see a need to > populate a table with 1M rows. I was not the man who made the test suite, usually sotuation is reverse somebody require to keep the original. But I agree, I'll fix. >> +--echo # normal HAVING >> +explain format=json select a, max(b) as TOP from t2 group by a having TOP > a; >> +--echo # HAVING is always TRUE (not printed) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1<>2; >> +--echo # HAVING is always FALSE (intercepted by message) >> +explain format=json select a, max(b) as TOP from t2 group by a having 1=2; >> +--echo # HAVING is absent >> +explain format=json select a, max(b) as TOP from t2 group by a; >> +drop table t0, t1, t2; >> diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc >> index 15ee67a..5f60aee 100644 >> --- a/sql/sql_explain.cc >> +++ b/sql/sql_explain.cc >> @@ -862,7 +862,20 @@ void Explain_select::print_explain_json(Explain_query *query, >> writer->add_member("const_condition"); >> write_item(writer, exec_const_cond); >> } >> - >> + /* we do not print always TRUE HAVING */ > This doesn't parse. Did you mean: > " Do not print HAVING clause if it always evaluates to TRUE" ? yes > >> + if (having || (having_value == Item::COND_FALSE)) >> + { >> + writer->add_member("having_condition"); >> + if (likely(having)) >> + write_item(writer, having); >> + else >> + { >> + /* Normally we should not go this branch, left just for safety */ >> + DBUG_ASSERT(having_value == Item::COND_FALSE); >> + writer->add_str("0"); >> + } >> + } >> + >> Filesort_tracker *first_table_sort= NULL; >> bool first_table_sort_used= false; >> int started_objects= 0; >> diff --git a/sql/sql_explain.h b/sql/sql_explain.h >> index f92a576..434be47 100644 >> --- a/sql/sql_explain.h >> +++ b/sql/sql_explain.h >> @@ -209,6 +209,7 @@ class Explain_select : public Explain_basic_join >> Explain_select(MEM_ROOT *root, bool is_analyze) : >> Explain_basic_join(root), >> message(NULL), >> + having(NULL), having_value(Item::COND_UNDEF), >> using_temporary(false), using_filesort(false), >> time_tracker(is_analyze), >> ops_tracker(is_analyze) >> @@ -231,7 +232,11 @@ class Explain_select : public Explain_basic_join >> >> /* Expensive constant condition */ >> Item *exec_const_cond; >> - >> + >> + /* HAVING condition */ >> + COND *having; >> + Item::cond_result having_value; >> + >> /* Global join attributes. In tabular form, they are printed on the first row */ >> bool using_temporary; >> bool using_filesort; >> diff --git a/sql/sql_select.cc b/sql/sql_select.cc >> index 3f2c2ea..be4b076 100644 >> --- a/sql/sql_select.cc >> +++ b/sql/sql_select.cc >> @@ -24159,6 +24159,8 @@ int JOIN::save_explain_data_intern(Explain_query *output, bool need_tmp_table, >> xpl_sel->using_filesort= true; >> >> xpl_sel->exec_const_cond= exec_const_cond; >> + xpl_sel->having= having; >> + xpl_sel->having_value= having_value; >> >> JOIN_TAB* const first_top_tab= join->first_breadth_first_optimization_tab(); >> JOIN_TAB* prev_bush_root_tab= NULL; > BR > Sergei

1 0

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