- developers - lists.mariadb.org

[Maria-developers] Option to _not_ disable semisync on slave timeout?
by Kristian Nielsen 28 Dec '15

28 Dec '15

Hi Jonas (or anyone else who may know), If I understand correctly, semisync replication has a timeout for how long it will wait for a slave to acknowledge transactions. If the timeout is exceeded, semisync is turned off on the master. Do you know if there is a facility to avoid semisync being turned off automatically in this case, maybe instead fail and roll back the master transaction? I was thinking at Google you might already have needed and implemented this (merged or not merged into MariaDB yet), or you may be aware of a patch by someone else for this? Thanks, and merry Christmas! - Kristian.

3 2

Re: [Maria-developers] [Commits] a1ab431: MDEV-7261 - Backport the default autosized value of
by Sergei Golubchik 28 Dec '15

28 Dec '15

Hi, Sergey! On Nov 20, Sergey Vojtovich wrote: > revision-id: a1ab4314d1f88fa954a774c322709822d7b95344 (mariadb-10.1.8-58-ga1ab431) > parent(s): cfc135b645db5fa78b9f63b1959ea3f2be137a26 > committer: Sergey Vojtovich > timestamp: 2015-11-20 17:32:26 +0400 > message: > > MDEV-7261 - Backport the default autosized value of > "table_definition_cache" from MySQL 5.6.8+ > > Fixed table_definition_cache auto-sizing. Note that this patch doesn't > address broken PFS auto-sizing. Do you plan to address it after you've broken it? How? Regards, Sergei

2 9

[Maria-developers] ABI breakage in Connector/C sometime between 2.0.0 and 2.2.2
by Daniel Schepler 28 Dec '15

28 Dec '15

While preparing Debian packaging for MariaDB Connector/C version 2.2.2, I noticed that there's an ABI breakage without a corresponding change of SONAME: version 2.0.0 had a symbol "get_tty_password@Base" whereas version 2.2.2 doesn't. I'm wondering how big of a breakage it is - i.e. is that something that was never meant to be in the API/ABI in the first place, or is an oversight? I'm also wondering whether it's worth renaming the Debian package from libmariadb2 to libmariadb2a because of this. -- Daniel Schepler

1 0

Re: [Maria-developers] [Commits] 2b3bffb: MDEV-8491 - On shutdown, report the user and the host executed that.
by Sergei Golubchik 24 Dec '15

24 Dec '15

Hi, Sergey! On Nov 25, Sergey Vojtovich wrote: > revision-id: 2b3bffb42cc4adbec2d91c1b9c4028374b63a51a (mariadb-10.1.8-75-g2b3bffb) > parent(s): 6019fee7d84e8ec7d64337ad080a04f9c106bb68 > committer: Sergey Vojtovich > timestamp: 2015-11-25 18:12:19 +0400 > message: > > MDEV-8491 - On shutdown, report the user and the host executed that. First, a test would be nice. I suppose you can add it to the main.shutdown test. > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index 0502841..0694cb0 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -1806,10 +1806,34 @@ static void close_server_sock() > #endif /*EMBEDDED_LIBRARY*/ > > > -void kill_mysql(void) > +static volatile char *shutdown_user; > +static void set_shutdown_user(THD *thd) > +{ > + char user_host_buff[MAX_USER_HOST_SIZE + 1]; > + char *user, *expected_shutdown_user= 0; > + Security_context *sctx= thd->security_ctx; > + > + strxnmov(user_host_buff, MAX_USER_HOST_SIZE, > + sctx->priv_user ? sctx->priv_user : "", "[", > + sctx->user ? sctx->user : (thd->slave_thread ? "SQL_SLAVE" : ""), > + "] @ ", > + sctx->host ? sctx->host : "", " [", > + sctx->ip ? sctx->ip : "", "]", NullS); this will be the fifth time this expression shows up in the source code. turn it into a function, perhaps? Like, an inline method of THD? also, sometimes it's "SQL_SLAVE", sometimes it's "", sometimes it's "unauthenticated", etc. I hope these differences can be removed and there will be one method that works identically for all occasions. Btw, you can use safe_str() helper here. > + > + if ((user= my_strdup(user_host_buff, MYF(0))) && > + !my_atomic_casptr((void **) &shutdown_user, > + (void **) &expected_shutdown_user, user)) > + my_free(user); > +} Interesting. Why is that? > + > + > +void kill_mysql(THD *thd) > { > DBUG_ENTER("kill_mysql"); > > + if (thd) > + set_shutdown_user(thd); > + > #if defined(SIGNALS_DONT_BREAK_READ) && !defined(EMBEDDED_LIBRARY) > abort_loop=1; // Break connection loops > close_server_sock(); // Force accept to wake up > @@ -1888,7 +1912,13 @@ static void __cdecl kill_server(int sig_ptr) > if (sig != 0) // 0 is not a valid signal number > my_sigset(sig, SIG_IGN); /* purify inspected */ > if (sig == MYSQL_KILL_SIGNAL || sig == 0) > - sql_print_information(ER_DEFAULT(ER_NORMAL_SHUTDOWN),my_progname); > + { > + char *user= (char *) my_atomic_loadptr((void**) &shutdown_user); > + sql_print_information(ER_DEFAULT(ER_NORMAL_SHUTDOWN), my_progname, > + user ? user : "unknown"); can it, really, be "unknown" here? when? > + if (user) > + my_free(user); > + } > else > sql_print_error(ER_DEFAULT(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */ > > diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt > index 59908dc..f65d466 100644 > --- a/sql/share/errmsg-utf8.txt > +++ b/sql/share/errmsg-utf8.txt > @@ -1735,29 +1735,29 @@ ER_WRONG_AUTO_KEY 42000 S1009 > ER_UNUSED_9 > eng "You should never see it" > ER_NORMAL_SHUTDOWN > - cze "%s: normální ukončení\n" > - dan "%s: Normal nedlukning\n" > - nla "%s: Normaal afgesloten \n" > - eng "%s: Normal shutdown\n" > - est "%s: MariaDB lõpetas\n" > - fre "%s: Arrêt normal du serveur\n" > - ger "%s: Normal heruntergefahren\n" > - greek "%s: Φυσιολογική διαδικασία shutdown\n" > - hun "%s: Normal leallitas\n" > - ita "%s: Shutdown normale\n" > - jpn "%s: 通常シャットダウン\n" > - kor "%s: 정상적인 shutdown\n" > - nor "%s: Normal avslutning\n" > - norwegian-ny "%s: Normal nedkopling\n" > - pol "%s: Standardowe zakończenie działania\n" > - por "%s: 'Shutdown' normal\n" > - rum "%s: Terminare normala\n" > - rus "%s: Корректная остановка\n" > - serbian "%s: Normalno gašenje\n" > - slo "%s: normálne ukončenie\n" > - spa "%s: Apagado normal\n" > - swe "%s: Normal avslutning\n" > - ukr "%s: Нормальне завершення\n" > + cze "%s: normální ukončení %s\n" > + dan "%s: Normal nedlukning %s\n" > + nla "%s: Normaal afgesloten %s\n" > + eng "%s: Normal shutdown by %s\n" > + est "%s: MariaDB lõpetas %s\n" > + fre "%s: Arrêt normal du serveur %s\n" > + ger "%s: Normal heruntergefahren %s\n" > + greek "%s: Φυσιολογική διαδικασία shutdown %s\n" > + hun "%s: Normal leallitas %s\n" > + ita "%s: Shutdown normale %s\n" > + jpn "%s: 通常シャットダウン %s\n" > + kor "%s: 정상적인 shutdown %s\n" > + nor "%s: Normal avslutning %s\n" > + norwegian-ny "%s: Normal nedkopling %s\n" > + pol "%s: Standardowe zakończenie działania %s\n" > + por "%s: 'Shutdown' normal %s\n" > + rum "%s: Terminare normala %s\n" > + rus "%s: Корректная остановка пользователем %s\n" > + serbian "%s: Normalno gašenje %s\n" > + slo "%s: normálne ukončenie %s\n" > + spa "%s: Apagado normal %s\n" > + swe "%s: Normal avslutning %s\n" > + ukr "%s: Нормальне завершення %s\n" Here you've fixed only the english and russian messages. Others would look pretty weird. Normal procedure in such a case is to remove all other languages and only keep those that you've fixed. In this case you can, perhaps, fix all of them in some easy way, like ger "%s: Normal heruntergefahren (%s)\n" ger "%s: Normal heruntergefahren / %s\n" ger "%s (%s): Normal heruntergefahren\n" ger "%s / %s: Normal heruntergefahren\n" or something else along these lines. See how it'll look like in the log: mysqld: Normal heruntergefahren foo [bar] @ localhost [127.0.0.1] mysqld: Normal heruntergefahren (foo [bar] @ localhost [127.0.0.1]) mysqld: Normal heruntergefahren / foo [bar] @ localhost [127.0.0.1] mysqld (foo [bar] @ localhost [127.0.0.1]): Normal heruntergefahren mysqld / foo [bar] @ localhost [127.0.0.1]: Normal heruntergefahren Regards, Sergei

2 3

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