November 2015 - developers - lists.mariadb.org

[Maria-developers] Please review MDEV-8092 Change Create_field::field from "const char *" to LEX_CSTRING
by Alexander Barkov 11 Jan '16

11 Jan '16

Hi Serg, Please review a patch for MDEV-8092. Thanks. Perhaps something interesting, about #3 in the task description. I added a debug output and collected some statistics for "mtr --suite=main", to check how these changes can potentially affect another task: MDEV-7954 my_strcasecmp_utf8() takes 0.19% in OLTP RO Here are the results: my_strcasecmp_utf8() is now called 18,709,905 times total during "mtr --suite=main" 9,200,498 of those are called to compare Field/Create_field names in Column_name::eq_name(). And 3,855,751 calls of my_strcasecmp_utf8() are now optimized away, because eq_name() immediately return "false" if the two name lengths are different. So before this change there were 18,709,905 + 3,855,751 = 22,565,656 calls of my_strcasecmp_utf8(). Looks roughly like 17% improvement in name comparison.

3 10

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

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

[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

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 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