- developers - lists.mariadb.org

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 26 Nov '15

26 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