- developers - lists.mariadb.org

Re: [Maria-developers] 334e7c9: MDEV-7895 - HANDLER READ doesn't upgrade metadata lock from S to SR
by Sergei Golubchik 08 May '15

08 May '15

Hi, Sergey! On May 07, Sergey Vojtovich wrote: > revision-id: 334e7c9bccbc6892efbb35f5930f80ccf1d770a8 > parent(s): cbc5157feb9801310e458f7ed10983ad478c881e > committer: Sergey Vojtovich > branch nick: mariadb > timestamp: 2015-04-01 14:07:02 +0400 > message: > > MDEV-7895 - HANDLER READ doesn't upgrade metadata lock from S to SR > > Change code for HANDLER READ statements to upgrade S metadata lock to > SR metadata lock for the duration of read. This allows us properly > isolate HANDLER READ from LOCK TABLES WRITE and makes metadata locking > for these statements consistent with locking for other DML. > > HANDLER-related tests had to be adjusted to take into account that > HANDLER READ will wait for and acquire SR lock. code-wise it's ok, but I'm not sure I like the resulting behavior. Here, the very first test: con1: handler t1 open; con2: drop table t1; -- waits con1: handler t1 read; -- deadlock as a user I'd expect that after handler open, I can use the handler. I don't care about locks, but supposedly handler open should take them all or handler read should solve it somehow, why I, a user, should bother? So, indeed, one option would be to acquire SR lock on handler open. Also, note the comment for MDL_SHARED: /* A shared metadata lock. To be used in cases when we are interested in object metadata only and there is no intention to access object data (e.g. for stored routines or during preparing prepared statements). We also mis-use this type of lock for open HANDLERs, since lock acquired by this statement has to be compatible with lock acquired by LOCK TABLES ... WRITE statement, i.e. SNRW (We can't get by by acquiring S lock at HANDLER ... OPEN time and upgrading it to SR lock for HANDLER ... READ as it doesn't solve problem with need to abort DML statements which wait on table level lock while having open HANDLER in the same connection). To avoid deadlock which may occur when SNRW lock is being upgraded to X lock for table on which there is an active S lock which is owned by thread which waits in its turn for table-level lock owned by thread performing upgrade we have to use thr_abort_locks_for_thread() facility in such situation. This problem does not arise for locks on stored routines as we don't use SNRW locks for them. It also does not arise when S locks are used during PREPARE calls as table-level locks are not acquired in this case. */ MDL_SHARED, Which begs more questions: - why open handler lock has to be compatible with SNRW? - why using S and upgrading to SR "didn't solve the problem" and now it suddenly does? Regards, Sergei

2 1

[Maria-developers] Windows line endings in source files (Re: [Maria-discuss] MariaDB 10.0.18 now available)
by Otto Kekäläinen 08 May '15

08 May '15

While preparing the Debian updates I noticed git complaning: The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in storage/spider/mysql-test/spider/t/have_partition.inc. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in storage/spider/mysql-test/spider/t/have_trigger.inc. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in storage/spider/mysql-test/spider/t/spider3_fixes.test. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in storage/spider/mysql-test/spider/t/spider3_fixes_part.test. Turns out a lot of source files in this release has Windows line endings: mariadb-10.0/mysql-test/r/func_regexp_pcre.result mariadb-10.0/mysql-test/r/loadxml.result mariadb-10.0/mysql-test/r/mysql_binary_mode.result mariadb-10.0/mysql-test/r/perror-win.result mariadb-10.0/mysql-test/std_data/loaddata7.dat mariadb-10.0/mysql-test/std_data/loadxml2.dat mariadb-10.0/packaging/WiX/CPackWixConfig.cmake mariadb-10.0/packaging/WiX/create_msi.cmake.in mariadb-10.0/packaging/WiX/custom_ui.wxs mariadb-10.0/packaging/WiX/extra.wxs.in mariadb-10.0/packaging/WiX/mysql_server.wxs.in mariadb-10.0/pcre/RunTest.bat mariadb-10.0/pcre/testdata/greppatN4 mariadb-10.0/sql/message.rc mariadb-10.0/sql/winservice.h mariadb-10.0/storage/connect/colblk.cpp mariadb-10.0/storage/connect/mysql-test/connect/my.cnf mariadb-10.0/storage/connect/mysql-test/connect/std_data/biblio.json mariadb-10.0/storage/connect/mysql-test/connect/std_data/bookstore.xml mariadb-10.0/storage/connect/mysql-test/connect/std_data/boyswin.txt mariadb-10.0/storage/connect/mysql-test/connect/std_data/emp.txt mariadb-10.0/storage/connect/mysql-test/connect/std_data/expense.json mariadb-10.0/storage/connect/mysql-test/connect/std_data/expenses.txt mariadb-10.0/storage/connect/mysql-test/connect/std_data/mulexp3.json mariadb-10.0/storage/connect/mysql-test/connect/std_data/mulexp4.json mariadb-10.0/storage/connect/mysql-test/connect/std_data/mulexp5.json mariadb-10.0/storage/connect/mysql-test/connect/std_data/sexe.csv mariadb-10.0/storage/connect/mysql-test/connect/std_data/sitmat.csv mariadb-10.0/storage/connect/mysql-test/connect/t/alter.test mariadb-10.0/storage/connect/mysql-test/connect/t/alter_xml.test mariadb-10.0/storage/connect/mysql-test/connect/t/bin.test mariadb-10.0/storage/connect/mysql-test/connect/t/datest.test mariadb-10.0/storage/connect/mysql-test/connect/t/fmt.test mariadb-10.0/storage/connect/mysql-test/connect/t/general.test mariadb-10.0/storage/connect/mysql-test/connect/t/json.test mariadb-10.0/storage/connect/mysql-test/connect/t/json_udf.test mariadb-10.0/storage/connect/mysql-test/connect/t/mrr.test mariadb-10.0/storage/connect/mysql-test/connect/t/mul.test mariadb-10.0/storage/connect/mysql-test/connect/t/myconn.inc mariadb-10.0/storage/connect/mysql-test/connect/t/myconn_cleanup.inc mariadb-10.0/storage/connect/mysql-test/connect/t/mysql.test mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_discovery.test mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_exec.test mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_grant.test mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_new.test mariadb-10.0/storage/connect/mysql-test/connect/t/null.test mariadb-10.0/storage/connect/mysql-test/connect/t/occur.test mariadb-10.0/storage/connect/mysql-test/connect/t/odbc_sqlite3.test mariadb-10.0/storage/connect/mysql-test/connect/t/part_file.test mariadb-10.0/storage/connect/mysql-test/connect/t/part_table.test mariadb-10.0/storage/connect/mysql-test/connect/t/pivot.test mariadb-10.0/storage/connect/mysql-test/connect/t/tbl.test mariadb-10.0/storage/connect/mysql-test/connect/t/unsigned.test mariadb-10.0/storage/connect/mysql-test/connect/t/upd.test mariadb-10.0/storage/connect/mysql-test/connect/t/updelx.test mariadb-10.0/storage/connect/mysql-test/connect/t/updelx2.test mariadb-10.0/storage/connect/mysql-test/connect/t/xcol.test mariadb-10.0/storage/connect/mysql-test/connect/t/xml_mdev5261.test mariadb-10.0/storage/connect/rcmsg.c mariadb-10.0/storage/connect/tabsys.h mariadb-10.0/storage/federatedx/README.windows mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/hs_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/hs_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_slave1_1.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/t/direct_aggregate.test mariadb-10.0/storage/spider/mysql-test/spider/bg/t/direct_aggregate_part.test mariadb-10.0/storage/spider/mysql-test/spider/bg/t/have_partition.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/t/have_trigger.inc mariadb-10.0/storage/spider/mysql-test/spider/bg/t/spider3_fixes.test mariadb-10.0/storage/spider/mysql-test/spider/bg/t/spider3_fixes_part.test mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/hs_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/hs_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_slave1_1.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/t/direct_aggregate.test mariadb-10.0/storage/spider/mysql-test/spider/handler/t/direct_aggregate_part.test mariadb-10.0/storage/spider/mysql-test/spider/handler/t/have_partition.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/t/have_trigger.inc mariadb-10.0/storage/spider/mysql-test/spider/handler/t/spider3_fixes.test mariadb-10.0/storage/spider/mysql-test/spider/handler/t/spider3_fixes_part.test mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_engine.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/include/hs_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/hs_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/include/init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/include/init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/include/init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/include/init_slave1_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/hs_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/hs_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_slave1_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/direct_aggregate.test mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/direct_aggregate_part.test mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/have_partition.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/have_trigger.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/spider3_fixes.test mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/spider3_fixes_part.test mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/hs_init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/hs_init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child2_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child2_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child2_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child3_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child3_2.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child3_3.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_slave1_1.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/direct_aggregate.test mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/direct_aggregate_part.test mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/have_partition.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/have_trigger.inc mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/spider3_fixes.test mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/spider3_fixes_part.test mariadb-10.0/storage/spider/mysql-test/spider/t/direct_aggregate.test mariadb-10.0/storage/spider/mysql-test/spider/t/direct_aggregate_part.test mariadb-10.0/storage/spider/mysql-test/spider/t/have_partition.inc mariadb-10.0/storage/spider/mysql-test/spider/t/have_trigger.inc mariadb-10.0/storage/spider/mysql-test/spider/t/spider3_fixes.test mariadb-10.0/storage/spider/mysql-test/spider/t/spider3_fixes_part.test mariadb-10.0/win/packaging/COPYING.rtf mariadb-10.0/win/packaging/CPackWixConfig.cmake mariadb-10.0/win/packaging/ca/CustomAction.cpp mariadb-10.0/win/packaging/custom_ui.wxs mariadb-10.0/win/packaging/extra.wxs.in mariadb-10.0/win/packaging/heidisql.cmake mariadb-10.0/win/packaging/heidisql.wxi.in mariadb-10.0/win/packaging/heidisql_feature.wxi.in mariadb-10.0/win/packaging/mysql_server.wxs.in mariadb-10.0/win/upgrade_wizard/stdafx.h mariadb-10.0/win/upgrade_wizard/targetver.h mariadb-10.0/win/upgrade_wizard/upgrade.cpp mariadb-10.0/win/upgrade_wizard/upgrade.h mariadb-10.0/win/upgrade_wizard/upgrade.rc mariadb-10.0/win/upgrade_wizard/upgradeDlg.h mariadb-10.0/win/upgrade_wizard/upgrade_wizard.exe.manifest This is the first time in two years I've found CRLF line endings in MariaDB source files. I hope I won't see them again..

3 2

[Maria-developers] Proposal accepted for GSoc'15
by sriram patil 08 May '15

08 May '15

Hi All, I am Sriram from IIIT Hyderabad, India. I am a Masters' student here. I have worked with MariaDB in GSoC'14 with Alexander Barkov. I had great time hacking on MariaDB last year, so, here I am again. :) This year I will be working on MaxScale filters with Markus Makela. The project title is "MaxScale filter to capture incoming operations for consumption in external sources". (MXS-2) I am excited to get started. Hoping to have a great summer this year as well. :) Thanks, Sriram Patil

2 2

Re: [Maria-developers] [Commits] 313a970: MDEV-7922 - ERROR 1939 (HY000): Engine PERFORMANCE_SCHEMA failed to discover
by Sergei Golubchik 07 May '15

07 May '15

Hi, Sergey! On Apr 08, svoj(a)mariadb.org wrote: > revision-id: 313a970cbe9ac523b0584d293e40bff66d4fbafc > parent(s): 7d9e94e2e6c32b906d1d8469e58bc04b8da1c121 > committer: Sergey Vojtovich > branch nick: mariadb > timestamp: 2015-04-08 10:55:51 +0400 > message: > > MDEV-7922 - ERROR 1939 (HY000): Engine PERFORMANCE_SCHEMA failed to discover > table > > Performance schema discovery fails if connection has no active database set. > > This happened due to restriction in SQL parser: table name with no database name > is ambiguous in such case. > > Fixed by temporary substitution of default database with being discovered table > database. ok to push Regards, Sergei

1 0

[Maria-developers] MDEV-7807 information_schema.processlist truncates queries with binary strings
by Alexander Barkov 07 May '15

07 May '15

Hi Sergei, Please review the patch for: MDEV-7807 information_schema.processlist truncates queries with binary strings The patch is for 10.1, as agreed with the reporter. Previously in 10.1 we fixed binary->string conversion behaviour not to truncate on bad bytes, and replace bad bytes to question marks instead. That fixed half of the problem reported. This patch adds a new new column "PROCESSLIST.INFO_BINARY blob". Thanks.

2 1

Re: [Maria-developers] [Commits] 93e746a: MDEV-7793 - Race condition between XA COMMIT/ROLLBACK and disconnect
by Sergei Golubchik 07 May '15

07 May '15

Hi, Sergey! On Mar 17, svoj(a)mariadb.org wrote: > revision-id: 93e746afb2d1a23cb933291ad736a20858b5ac3e > parent(s): ccc7297fe94af1129c717f91d31fa075d54a0371 > committer: Sergey Vojtovich > branch nick: mariadb > timestamp: 2015-03-17 19:49:04 +0400 > message: > > MDEV-7793 - Race condition between XA COMMIT/ROLLBACK and disconnect > > XA COMMIT/ROLLBACK of XA transaction owned by different thread may access > freed memory if that thread disconnects at the same time. > > Also concurrent XA COMMIT/ROLLBACK of recovered XA transaction were not > serialized properly. > > diff --git a/sql/sql_class.cc b/sql/sql_class.cc > index 3071ba6..f18231d 100644 > --- a/sql/sql_class.cc > +++ b/sql/sql_class.cc > @@ -5355,7 +5378,7 @@ bool xid_cache_insert(THD *thd, XID_STATE *xid_state) > switch (res) > { > case 0: > - xid_state->xid_cache_element->mark_initialized(); > + xid_state->xid_cache_element->set(XID_cache_element::ACQUIRED); Why not mark_acquired() here? Can you be sure that no other thread has already acquired this xid_cache_element after you've inserted it? > break; > case 1: > my_error(ER_XAER_DUPID, MYF(0)); Regards, Sergei

2 2

Re: [Maria-developers] [Commits] 54e9df4: MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2
by Sergei Golubchik 05 May '15

05 May '15

Hi, Vicentiu! Two comments to the patch - see below. One general comment - you've done quite a bit of refactoring and this refactoring is *not* in 10.1 style. How should it be merged into 10.1? Should your changes be ignored (and not merged)? Should they be merged as is? Aren't they mostly unnecessary in 10.1? On May 05, vicentiu(a)mariadb.org wrote: > revision-id: 54e9df42d1f5837ae0df51e511ba48d3682be20d > parent(s): ae18a28500974351cf42fa3cac67c83e0647d510 > committer: Vicențiu Ciorbaru > branch nick: server > timestamp: 2015-05-05 21:19:53 +0300 > message: > > MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2 > > Gave priority to password field when using a native authentication > plugin. > > Also, prevented a user from setting an invalid auth_string, when using > native authentication. > > diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc > --- a/sql/sql_acl.cc > +++ b/sql/sql_acl.cc > @@ -862,6 +862,17 @@ static char *fix_plugin_ptr(char *name) > return name; > } > > +static bool plugin_is_native(const char* plugin) > +{ > + if (!plugin) > + return false; > + if ((my_strcasecmp(system_charset_info, plugin, > + native_password_plugin_name.str) == 0) || > + (my_strcasecmp(system_charset_info, plugin, > + old_password_plugin_name.str) == 0)) > + return true; > + return false; > +} I tried to compare plugin names almost always by pointers, not by comparing strings. That is, the string (as coming from the table or from the user) is strcmp'ed *once* and then replaced with a pointer to a static plugin name string. So I'd prefer it if you'd remove plugin_is_native() and instead used fix_user_plugin_ptr(). And then you remove fix_user_plugin_ptr() from acl_update_user() and acl_insert_user(). > /** > Fix ACL::plugin pointer to point to a hard-coded string, if appropriate > > @@ -1973,6 +2020,10 @@ static void acl_update_user(const char *user, const char *host, > acl_user->auth_string.length= auth->length; > if (fix_user_plugin_ptr(acl_user)) > acl_user->plugin.str= strmake_root(&acl_memroot, plugin->str, plugin->length); > + else > + set_user_salt(acl_user, acl_user->auth_string.str, > + acl_user->auth_string.length); what if auth_string is empty, how does the password take precedence in this case? > + > } > else > if (password[0]) Regards, Sergei

1 0

[Maria-developers] Please review: MDEV-7778 impossible create copy of table, if table contain default value for timestamp field
by Alexander Barkov 04 May '15

04 May '15

Hi Sergei, Please review a patch for MDEV-7778. As agreed on IRC, this is a merge from the latest MySQL, which has already fixed the problem. Greetings.

2 1

[Maria-developers] connect on IBM s390
by Alexander Barkov 04 May '15

04 May '15

Hi Olivier, MariaDB fails with some Connect tests on IBM s390. Please have a look into Debian build bot results: https://buildd.debian.org/status/fetch.php?pkg=mariadb-10.0&arch=s390x&ver=… I currently have a temporary access to an IMB s390 machine. It would be nice to fix the failures. Please find the mtr log attached. This is what I got on this test machine. The failures are very similar to what Debian build bot has. If you don't mind, I'd like to start fixing failures with "bin" and "dbf". 1. dbf.bin fails because Connect writes the DBF file header using the current platform endiannes, while from my understanding it should always write the header using little endianness. This should be fixed in the relevant DBF code in Connect. Can you please do this? 2. connect.bin fails because Connect treats columns in the current machine byte order, while Testbal.dat was created on a little endian machine. I can see a few options to fix this test failure: a. Disable on big endian machines. Bad idea. b. Make it possible to specify endiannes of a data file (or even per column), so we can tell in the tests that Testbal.dat (or its relevant columns) are in little endian format. Perhaps it's already possible in the latest Connect versions. Is it? If it's not, how difficult would be to implement this? c. Have two pre-created files Testbal_le.dat and Testbal_be.dat and load the one that suites the current machine endiannes. I'm thinking of going "c" now, with a hope to have both "b" and "c" in the future. If you agree, we'll need a big-endian version of Testbal.dat. 3. It seems that some other tests fail for the same reasons with #2. Having a big-endian version of the test data files, or having the endian flag in CREATE TABLE, would fix some of them. I suggest we fix "bin" first, and make sure it works fine an all platforms. Then do the same thing for the other tests. Thanks.

1 0

Re: [Maria-developers] [Commits] 4bff8b0: MDEV-7004 - Merge scalability fixes from 10.0-power
by jocelyn fournier 02 May '15

02 May '15

Hi Sergey, Just to be sure, currently MariaDB doesn't implement any Hardware Transactional Memory Built-in Functions ? If so, is there any plan to evaluate the gain they could offer to MariaDB ? Thanks and regards, Jocelyn Fournier Le 04/12/2014 14:45, svoj(a)mariadb.org a écrit : > revision-id: 4bff8b0b03ba82cd0ae6817b54de1780e89047ca > parent(s): 3526fe1b6000b2558290007e5cc3a1018850787c > committer: Sergey Vojtovich > branch nick: 10.1 > timestamp: 2014-12-04 17:44:46 +0400 > message: > > MDEV-7004 - Merge scalability fixes from 10.0-power > > Preallocate dynamic array and bitmap on mem_root to avoid expensive malloc. > This reduces number of allocations from 39 to 31 per OLTP RO transaction. > > --- > sql/opt_range.cc | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/sql/opt_range.cc b/sql/opt_range.cc > index 1a9ae3d..813508c 100644 > --- a/sql/opt_range.cc > +++ b/sql/opt_range.cc > @@ -1838,8 +1838,6 @@ void SQL_SELECT::cleanup() > index= key_nr; > head= table; > key_part_info= head->key_info[index].key_part; > - my_init_dynamic_array(&ranges, sizeof(QUICK_RANGE*), 16, 16, > - MYF(MY_THREAD_SPECIFIC)); > > /* 'thd' is not accessible in QUICK_RANGE_SELECT::reset(). */ > mrr_buf_size= thd->variables.mrr_buff_size; > @@ -1857,9 +1855,12 @@ void SQL_SELECT::cleanup() > file= head->file; > record= head->record[0]; > > - /* Allocate a bitmap for used columns (Q: why not on MEM_ROOT?) */ > - if (!(bitmap= (my_bitmap_map*) my_malloc(head->s->column_bitmap_size, > - MYF(MY_WME | MY_THREAD_SPECIFIC)))) > + my_init_dynamic_array2(&ranges, sizeof(QUICK_RANGE*), > + thd->alloc(sizeof(QUICK_RANGE*) * 16), 16, 16, > + MYF(MY_THREAD_SPECIFIC)); > + > + /* Allocate a bitmap for used columns */ > + if (!(bitmap= (my_bitmap_map*) thd->alloc(head->s->column_bitmap_size))) > { > column_bitmap.bitmap= 0; > *create_error= 1; > @@ -1923,7 +1924,6 @@ void QUICK_RANGE_SELECT::range_end() > } > delete_dynamic(&ranges); /* ranges are allocated in alloc */ > free_root(&alloc,MYF(0)); > - my_free(column_bitmap.bitmap); > } > my_free(mrr_buf_desc); > DBUG_VOID_RETURN; > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

2 1