- developers - lists.mariadb.org

[Maria-developers] 10.3 branches
by Alexander Barkov 20 Dec '16

20 Dec '16

Hello Serg, all, A few weeks ago I created a new branch "10.3" and pushed essential patches needed for the compatibility project. It worked as follows: - In 10.3: git rebase origin/10.2 git push --force - In bb-10.2-compatibility: git rebase origin/10.3 git push --force Now as other developers start to push into 10.3, this won't work anymore. We briefly discussed with Monty that, as the compatibility project should be as stable as possible and merging all 10.3 patches into bb-10.2-compatibility is not desirable, we could try something like this: Add a new branch (Monty proposed "10.3-base" as the name) and propagate changes as follows: - In 10.3-base: git rebase origin/10.2 git push --force - In bb-10.2-compatibility git rebase origin/10.3-base git push --force - In 10.3: git merge origin/10.3-base git push (no --force) 10.2 ---(rebase)--->10.3-base--(rebase)-->bb-10.2-compatibility | | (merge) (merge) | | V | 10.3<-----------------/ Any objections about this scheme? I'd only propose to use "10.2-ext" instead of "10.3-base", as this intermediate branch is going to be more 10.2 than 10.3. Thanks.

3 6

Re: [Maria-developers] [Commits] 9f863a15b03: MDEV-11602 InnoDB leaks foreign key metadata on DDL operations
by Jan Lindström 19 Dec '16

19 Dec '16

ok to push. Most likely the double free was result of some other bug fixed later. R: Jan On Mon, Dec 19, 2016 at 4:00 PM, <marko.makela(a)mariadb.com> wrote: > revision-id: 9f863a15b037c0ddffc2d12c1f7d841466f9f345 (mariadb-10.0.28-27- > g9f863a15b03) > parent(s): eb4f2e063c341d9f3644339c68cb01679e782001 > author: Marko Mäkelä > committer: Marko Mäkelä > timestamp: 2016-12-19 15:57:41 +0200 > message: > > MDEV-11602 InnoDB leaks foreign key metadata on DDL operations > > Essentially revert MDEV-6759, which addressed a double free of memory > by removing the freeing altogether, introducing the memory leaks. > No double free was observed when running the test suite -DWITH_ASAN. > > Replace some mem_heap_free(foreign->heap) with dict_foreign_free(foreign) > so that the calls can be located and instrumented more easily when needed. > > --- > storage/innobase/dict/dict0dict.cc | 8 ++++---- > storage/innobase/dict/dict0load.cc | 2 +- > storage/xtradb/dict/dict0dict.cc | 8 ++++---- > storage/xtradb/dict/dict0load.cc | 2 +- > 4 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/ > dict0dict.cc > index f75d584e70d..2e40946224e 100644 > --- a/storage/innobase/dict/dict0dict.cc > +++ b/storage/innobase/dict/dict0dict.cc > @@ -1614,6 +1614,7 @@ struct dict_foreign_remove_partial > if (table != NULL) { > table->referenced_set.erase(foreign); > } > + dict_foreign_free(foreign); > } > }; > > @@ -3535,8 +3536,7 @@ dict_foreign_add_to_cache( > } > > if (for_in_cache) { > - /* Free the foreign object */ > - mem_heap_free(foreign->heap); > + dict_foreign_free(foreign); > } else { > for_in_cache = foreign; > } > @@ -3564,7 +3564,7 @@ dict_foreign_add_to_cache( > " the ones in table."); > > if (for_in_cache == foreign) { > - mem_heap_free(foreign->heap); > + dict_foreign_free(foreign); > } > > return(DB_CANNOT_ADD_CONSTRAINT); > @@ -3620,7 +3620,7 @@ dict_foreign_add_to_cache( > be one */ > } > > - mem_heap_free(foreign->heap); > + dict_foreign_free(foreign); > } > > return(DB_CANNOT_ADD_CONSTRAINT); > diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/ > dict0load.cc > index e68bbe7d10a..77a31e5de63 100644 > --- a/storage/innobase/dict/dict0load.cc > +++ b/storage/innobase/dict/dict0load.cc > @@ -489,7 +489,7 @@ dict_process_sys_foreign_rec( > } > > /* This recieves a dict_foreign_t* that points to a stack variable. > - So mem_heap_free(foreign->heap) is not used as elsewhere. > + So dict_foreign_free(foreign) is not used as elsewhere. > Since the heap used here is freed elsewhere, foreign->heap > is not assigned. */ > foreign->id = mem_heap_strdupl(heap, (const char*) field, len); > diff --git a/storage/xtradb/dict/dict0dict.cc b/storage/xtradb/dict/ > dict0dict.cc > index 5339ecfaed6..3845138c8bf 100644 > --- a/storage/xtradb/dict/dict0dict.cc > +++ b/storage/xtradb/dict/dict0dict.cc > @@ -1614,6 +1614,7 @@ struct dict_foreign_remove_partial > if (table != NULL) { > table->referenced_set.erase(foreign); > } > + dict_foreign_free(foreign); > } > }; > > @@ -3539,8 +3540,7 @@ dict_foreign_add_to_cache( > } > > if (for_in_cache) { > - /* Free the foreign object */ > - mem_heap_free(foreign->heap); > + dict_foreign_free(foreign); > } else { > for_in_cache = foreign; > } > @@ -3564,7 +3564,7 @@ dict_foreign_add_to_cache( > " the ones in table."); > > if (for_in_cache == foreign) { > - mem_heap_free(foreign->heap); > + dict_foreign_free(foreign); > } > > return(DB_CANNOT_ADD_CONSTRAINT); > @@ -3620,7 +3620,7 @@ dict_foreign_add_to_cache( > be one */ > } > > - mem_heap_free(foreign->heap); > + dict_foreign_free(foreign); > } > > return(DB_CANNOT_ADD_CONSTRAINT); > diff --git a/storage/xtradb/dict/dict0load.cc b/storage/xtradb/dict/ > dict0load.cc > index ca7de72c9b9..9ea4f4d873a 100644 > --- a/storage/xtradb/dict/dict0load.cc > +++ b/storage/xtradb/dict/dict0load.cc > @@ -491,7 +491,7 @@ dict_process_sys_foreign_rec( > } > > /* This recieves a dict_foreign_t* that points to a stack variable. > - So mem_heap_free(foreign->heap) is not used as elsewhere. > + So dict_foreign_free(foreign) is not used as elsewhere. > Since the heap used here is freed elsewhere, foreign->heap > is not assigned. */ > foreign->id = mem_heap_strdupl(heap, (const char*) field, len); > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

1 0

Re: [Maria-developers] [Commits] 8bfc350: MDEV-10148: Database crashes in the query to the View
by Oleksandr Byelkin 19 Dec '16

19 Dec '16

Hi, Sergei! On 12/16/2016 03:16 PM, Sergei Petrunia wrote: > revision-id: 8bfc35041195b46c8f4666dd02f600e878f45643 > parent(s): 96d2e0480ffbc36c803db5a7d5bcefd3470c5f72 > committer: Sergei Petrunia > branch nick: 5.5 > timestamp: 2016-12-16 17:16:02 +0300 > message: > > MDEV-10148: Database crashes in the query to the View > > Fix st_select_lex::is_merged_child_of to work across merged views or > derived tables. > OK to push! [skip]

1 0

[Maria-developers] Please review MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_precision()
by Alexander Barkov 19 Dec '16

19 Dec '16

Hello Sergei, Please review a patch for MDEV-10524. Thanks!

2 2

Re: [Maria-developers] [Commits] 12034ae: MDEV-10927: Crash When Using sort_union Optimization
by Sergey Petrunia 16 Dec '16

16 Dec '16

The patch is ok, but there is a problem with the testcase: when I run the testcase on the unmodified 5.5 binary, it passes. When I run the tescase from the MDEV, I get the crash. Please fix the testcase. This will also provide test coverage (which was lacking, and this is why have this bug in the first place). On Fri, Dec 16, 2016 at 11:19:43AM +0530, Varun wrote: > revision-id: 12034aec831d776725a43c7537ab4256efb1c974 (mariadb-5.5.53-25-g12034ae) > parent(s): 14e1f32894cdbe63a614738cfd93e9d0818dedee > author: Varun Gupta > committer: Varun Gupta > timestamp: 2016-12-16 11:03:24 +0530 > message: > > MDEV-10927: Crash When Using sort_union Optimization > > In file sql/filesort.cc,when merge_buffers() is called then > - queue_remove(&queue,0) is called > - For the function queue_remove there is assertion states that the element to be removed should have index >=1 > - this is causing the assertion to fail. > > Fixed by removing the top element. > > --- > mysql-test/r/index_merge_innodb.result | 52 ++++++++++++++++++++++++++++++++++ > mysql-test/t/index_merge_innodb.test | 42 ++++++++++++++++++++++++++- > sql/filesort.cc | 2 +- > 3 files changed, 94 insertions(+), 2 deletions(-) > > diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result > index b93d15f..49e0a57 100644 > --- a/mysql-test/r/index_merge_innodb.result > +++ b/mysql-test/r/index_merge_innodb.result > @@ -792,4 +792,56 @@ a b c > 8 m m > 9 d d > DROP TABLE t1; > +# > +# MDEV-10927: Crash When Using sort_union Optimization > +# > +SET optimizer_switch='index_merge_sort_intersection=on'; > +CREATE TABLE IF NOT EXISTS t1 ( > +id int(11) NOT NULL AUTO_INCREMENT, > +contact_id int(11) NOT NULL, > +role_id int(11) NOT NULL, > +company_type_id int(11) NOT NULL, > +company_id int(11) NOT NULL, > +team_id int(11) NOT NULL, > +user_id int(11) NOT NULL, > +PRIMARY KEY (id), > +KEY contact_id (contact_id), > +KEY user_id (user_id), > +KEY company_id (company_id), > +KEY team_id (team_id) USING BTREE > +) ENGINE=InnoDB AUTO_INCREMENT=12860259 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT; > +INSERT INTO t1 (id, contact_id, role_id, company_type_id, company_id, team_id, user_id) VALUES > +(5343408, 23913609, 0, 6, 2321, 0, 0), > +(7841449, 39582328, 1194, 0, 0, 0, 57291), > +(7841507, 28707292, 1194, 0, 0, 0, 57291), > +(7841543, 26376778, 1194, 0, 0, 0, 137571), > +(7841563, 42475686, 1194, 0, 0, 0, 137571), > +(7841573, 35956831, 1194, 0, 0, 0, 447223), > +(7841575, 37975231, 1194, 0, 0, 0, 447223), > +(7843049, 42693923, 1194, 0, 0, 0, 376261), > +(7843600, 42696877, 1194, 0, 0, 0, 376261), > +(12858344, 82851915, 1194, 0, 0, 0, 993011), > +(12858554, 80183799, 1194, 0, 0, 0, 993011), > +(12858803, 82649193, 1194, 0, 0, 0, 1288749), > +(12858878, 82700925, 1194, 0, 0, 0, 1288749), > +(12860248, 28642729, 1194, 0, 0, 0, 1234288), > +(12860258, 28642729, 0, 0, 0, 0, 1234288), > +(12860259, 28642729, 1194, 0, 0, 0, 0); > +SELECT SQL_NO_CACHE contact_id FROM t1 FORCE INDEX (user_id,company_id) WHERE user_id = '57291' OR (user_id IN(55838,55839,56998,57260,57291,60227,121997,137571,173600,219233,306480,354991,358594,376261,398572,447223,472009,646282,932548,993011,1004609,1021262,1177117,1234288,1283121,1288749,1337771,57291) AND role_id = '1194') OR company_id = '2321'; > +contact_id > +23913609 > +26376778 > +28642729 > +28707292 > +35956831 > +37975231 > +39582328 > +42475686 > +42693923 > +42696877 > +80183799 > +82649193 > +82700925 > +82851915 > +DROP TABLE t1; > set optimizer_switch= @optimizer_switch_save; > diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/t/index_merge_innodb.test > index 6a1cb53..f1fdbbd 100644 > --- a/mysql-test/t/index_merge_innodb.test > +++ b/mysql-test/t/index_merge_innodb.test > @@ -172,5 +172,45 @@ WHERE ( tb.b != ta.b OR tb.a = ta.a ) > > DROP TABLE t1; > > -set optimizer_switch= @optimizer_switch_save; > +--echo # > +--echo # MDEV-10927: Crash When Using sort_union Optimization > +--echo # > > +SET optimizer_switch='index_merge_sort_intersection=on'; > + > +CREATE TABLE IF NOT EXISTS t1 ( > + id int(11) NOT NULL AUTO_INCREMENT, > + contact_id int(11) NOT NULL, > + role_id int(11) NOT NULL, > + company_type_id int(11) NOT NULL, > + company_id int(11) NOT NULL, > + team_id int(11) NOT NULL, > + user_id int(11) NOT NULL, > + PRIMARY KEY (id), > + KEY contact_id (contact_id), > + KEY user_id (user_id), > + KEY company_id (company_id), > + KEY team_id (team_id) USING BTREE > + ) ENGINE=InnoDB AUTO_INCREMENT=12860259 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT; > + > +INSERT INTO t1 (id, contact_id, role_id, company_type_id, company_id, team_id, user_id) VALUES > + (5343408, 23913609, 0, 6, 2321, 0, 0), > + (7841449, 39582328, 1194, 0, 0, 0, 57291), > + (7841507, 28707292, 1194, 0, 0, 0, 57291), > + (7841543, 26376778, 1194, 0, 0, 0, 137571), > + (7841563, 42475686, 1194, 0, 0, 0, 137571), > + (7841573, 35956831, 1194, 0, 0, 0, 447223), > + (7841575, 37975231, 1194, 0, 0, 0, 447223), > + (7843049, 42693923, 1194, 0, 0, 0, 376261), > + (7843600, 42696877, 1194, 0, 0, 0, 376261), > + (12858344, 82851915, 1194, 0, 0, 0, 993011), > + (12858554, 80183799, 1194, 0, 0, 0, 993011), > + (12858803, 82649193, 1194, 0, 0, 0, 1288749), > + (12858878, 82700925, 1194, 0, 0, 0, 1288749), > + (12860248, 28642729, 1194, 0, 0, 0, 1234288), > + (12860258, 28642729, 0, 0, 0, 0, 1234288), > + (12860259, 28642729, 1194, 0, 0, 0, 0); > +--sorted_result > +SELECT SQL_NO_CACHE contact_id FROM t1 FORCE INDEX (user_id,company_id) WHERE user_id = '57291' OR (user_id IN(55838,55839,56998,57260,57291,60227,121997,137571,173600,219233,306480,354991,358594,376261,398572,447223,472009,646282,932548,993011,1004609,1021262,1177117,1234288,1283121,1288749,1337771,57291) AND role_id = '1194') OR company_id = '2321'; > +DROP TABLE t1; > +set optimizer_switch= @optimizer_switch_save; > diff --git a/sql/filesort.cc b/sql/filesort.cc > index 5bb5c64..38404b0 100644 > --- a/sql/filesort.cc > +++ b/sql/filesort.cc > @@ -1411,7 +1411,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, > if (!(error= (int) read_to_buffer(from_file, buffpek, > rec_length))) > { > - queue_remove(&queue,0); > + (void) queue_remove_top(&queue); > reuse_freed_buff(&queue, buffpek, rec_length); > } > else if (error == -1) BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] MDEV-11558 Split Item_type_holder::display_length into virtual methods in Type_handler
by Alexander Barkov 16 Dec '16

16 Dec '16

Hello Nirbhay, Can you please review a patch for MDEV-11558? Thanks!

2 1

Re: [Maria-developers] [Commits] 5f02c66: MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLES
by Sergei Golubchik 15 Dec '16

15 Dec '16

Hi, Sergey! On Dec 13, Sergey Vojtovich wrote: > revision-id: 5f02c661f3d30baf08071acad29cef40fad0739c (mariadb-10.2.2-225-g5f02c66) > parent(s): 65b4d7457e40ee25302d2df28b0d200ff59d9e6d > committer: Sergey Vojtovich > timestamp: 2016-12-13 16:17:49 +0400 > message: > > MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLES > > Implementation of MDEV-7660 introduced unwanted incompatible change: > modifications under LOCK TABLES with autocommit enabled are rolled back on > disconnect. Previously everything was committed, because LOCK TABLES didn't > adjust autocommit setting. Thanks, very helpful comment (that I didn't quote in my reply for brevity)! Few questions below: > diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test > index dea16c8..30fb694 100644 > --- a/mysql-test/t/delayed.test > +++ b/mysql-test/t/delayed.test > @@ -319,7 +319,7 @@ drop table if exists t1; > --enable_warnings > create table t1 (a int, b int); > insert into t1 values (1,1); > -lock table t1 read; > +lock table t1 read local; why? > connect (update,localhost,root,,); > connection update; > --send insert delayed into t1 values (2,2); > diff --git a/sql/mdl.h b/sql/mdl.h > index 7d659af..d77c07c 100644 > --- a/sql/mdl.h > +++ b/sql/mdl.h > @@ -196,6 +196,12 @@ enum enum_mdl_type { > */ > MDL_SHARED_UPGRADABLE, > /* > + A shared metadata lock for cases when we need to read data from table > + and block all concurrent modifications to it (for both data and metadata). > + Used by LOCK TABLES READ statement. > + */ > + MDL_SHARED_READ_ONLY, Hmm, stronger than MDL_SHARED_WRITE? All read locks were before write locks until now. Why is that changed? > + /* > An upgradable shared metadata lock which blocks all attempts to update > table data, allowing reads. > A connection holding this kind of lock can read table metadata and read > diff --git a/sql/sql_base.cc b/sql/sql_base.cc > index 1ca7e9c..d3f4517 100644 > --- a/sql/sql_base.cc > +++ b/sql/sql_base.cc > @@ -1496,6 +1496,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx) > to general/slow log would be disabled in read only transactions. > */ > if (table_list->mdl_request.type >= MDL_SHARED_WRITE && > + table_list->mdl_request.type != MDL_SHARED_READ_ONLY && if you're going to keep read and write locks mixed, then I'd suggest to move this condition into a small inline helper, like table_list->mdl_request.is_write_lock(). it's used few times already in this very file and there will be only one place to change if we'll need to add, say, MDL_SHARED_WRITE_LOW_PRIO > thd->tx_read_only && > !(flags & (MYSQL_LOCK_LOG_TABLE | MYSQL_OPEN_HAS_MDL_LOCK))) > { > diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc > index 6dc9192..0d740bb 100644 > --- a/sql/sql_parse.cc > +++ b/sql/sql_parse.cc > @@ -2728,27 +2728,76 @@ bool sp_process_definer(THD *thd) > static bool lock_tables_open_and_lock_tables(THD *thd, TABLE_LIST *tables) > { > Lock_tables_prelocking_strategy lock_tables_prelocking_strategy; > + MDL_deadlock_and_lock_abort_error_handler deadlock_handler; > + MDL_savepoint mdl_savepoint= thd->mdl_context.mdl_savepoint(); > uint counter; > TABLE_LIST *table; > > thd->in_lock_tables= 1; > > +retry: > + > if (open_tables(thd, &tables, &counter, 0, &lock_tables_prelocking_strategy)) > goto err; > > - /* > - We allow to change temporary tables even if they were locked for read > - by LOCK TABLES. To avoid a discrepancy between lock acquired at LOCK > - TABLES time and by the statement which is later executed under LOCK TABLES > - we ensure that for temporary tables we always request a write lock (such > - discrepancy can cause problems for the storage engine). > - We don't set TABLE_LIST::lock_type in this case as this might result in > - extra warnings from THD::decide_logging_format() even though binary logging > - is totally irrelevant for LOCK TABLES. > - */ > for (table= tables; table; table= table->next_global) > - if (!table->placeholder() && table->table->s->tmp_table) > - table->table->reginfo.lock_type= TL_WRITE; > + { > + if (!table->placeholder()) > + { > + if (table->table->s->tmp_table) > + { > + /* > + We allow to change temporary tables even if they were locked for read > + by LOCK TABLES. To avoid a discrepancy between lock acquired at LOCK > + TABLES time and by the statement which is later executed under LOCK > + TABLES we ensure that for temporary tables we always request a write > + lock (such discrepancy can cause problems for the storage engine). > + We don't set TABLE_LIST::lock_type in this case as this might result > + in extra warnings from THD::decide_logging_format() even though > + binary logging is totally irrelevant for LOCK TABLES. > + */ > + table->table->reginfo.lock_type= TL_WRITE; > + } > + else if (table->mdl_request.type == MDL_SHARED_READ && > + ! table->prelocking_placeholder && > + table->table->file->lock_count() == 0) > + { > + /* > + In case when LOCK TABLE ... READ LOCAL was issued for table with > + storage engine which doesn't support READ LOCAL option and doesn't > + use THR_LOCK locks we need to upgrade weak SR metadata lock acquired > + in open_tables() to stronger SRO metadata lock. > + This is not needed for tables used through stored routines or > + triggers as we always acquire SRO (or even stronger SNRW) metadata > + lock for them. > + */ > + deadlock_handler.init(); > + thd->push_internal_handler(&deadlock_handler); > + > + bool result= thd->mdl_context.upgrade_shared_lock( > + table->table->mdl_ticket, > + MDL_SHARED_READ_ONLY, > + thd->variables.lock_wait_timeout); > + > + thd->pop_internal_handler(); > + > + if (deadlock_handler.need_reopen()) > + { > + /* > + Deadlock occurred during upgrade of metadata lock. > + Let us restart acquring and opening tables for LOCK TABLES. will you use MDL_SHARED_READ_ONLY right away when retrying? or it'll do the upgrade thing again? > + */ > + close_tables_for_reopen(thd, &tables, mdl_savepoint); > + if (thd->open_temporary_tables(tables)) > + goto err; > + goto retry; > + } > + > + if (result) > + goto err; > + } > + } > + } > > if (lock_tables(thd, tables, counter, 0) || > thd->locked_tables_list.init_locked_tables(thd)) Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

2 3

[Maria-developers] MDEV-11514, MDEV-11497, MDEV-11554, MDEV-11555 - IN and CASE type aggregation problems
by Alexander Barkov 15 Dec '16

15 Dec '16

Hello Sanja, Please review a patch fixing a number of problems in IN and CASE. This is a per-requisite for further Type_handler related work, to clean-up the code before moving it to more IN and CASE related methods in Type_handler. Thanks!

1 0

Re: [Maria-developers] [Commits] bbc52df: MDEV-11490 Galera_3nodes test suite does not suppress Warnings.
by Nirbhay Choubey 14 Dec '16

14 Dec '16

Hi Sachin, I see that you have added a lot of warnings to the suite-level suppression list. Does *all* the new warnings show up for all the tests? I'd only add ones that make sense for the entire suite, and add the individuals to the specific test by calling mtr.add_suppression("<pattern>"). Ping me on slack if you need to discuss this further. Best, Nirbhay On Tue, Dec 6, 2016 at 1:53 AM, <sachin.setiya(a)mariadb.com> wrote: > revision-id: bbc52df39b7dedca50943a7cd99ee80b9e2f5b12 > (mariadb-10.1.19-24-gbbc52df) > parent(s): 611f91605adce17df87acf96b5aede0b73d0fc12 > author: SachinSetiya > committer: SachinSetiya > timestamp: 2016-12-06 12:21:16 +0530 > message: > > MDEV-11490 Galera_3nodes test suite does not suppress Warnings. > > Problem:- While running individual tests of Galera_3nodes , > We get warnings like '[Warning] WSREP: Could not open state file > for reading: '. And because of this individual tests fails. > > Solution:- We change suite.pm of Galera_3nodes to supress these warnings. > > --- > mysql-test/suite/galera_3nodes/suite.pm | 34 > ++++++++++++++++++++++++++++----- > 1 file changed, 29 insertions(+), 5 deletions(-) > > diff --git a/mysql-test/suite/galera_3nodes/suite.pm > b/mysql-test/suite/galera_3nodes/suite.pm > index 39d5acb..74f7dfa 100644 > --- a/mysql-test/suite/galera_3nodes/suite.pm > +++ b/mysql-test/suite/galera_3nodes/suite.pm > @@ -25,7 +25,8 @@ return "No my_print_defaults" unless $epath; > push @::global_suppressions, > ( > qr(WSREP: wsrep_sst_receive_address is set to '127.0.0.1), > - qr(WSREP: Could not open saved state file for reading: ), > + qr(WSREP: Could not open saved state file for reading: .*), > + qr(WSREP: Could not open state file for reading: .*), > qr(WSREP: Gap in state sequence. Need state transfer.), > qr(WSREP: Failed to prepare for incremental state transfer:), > qr(WSREP:.*down context.*), > @@ -33,16 +34,39 @@ push @::global_suppressions, > qr(WSREP: last inactive check more than .* skipping check), > qr(WSREP: SQL statement was ineffective), > qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned.), > - qr|WSREP: access file$gvwstate.dat$ failed$No such file or > directory$|, > + qr|WSREP: access file$.*gvwstate.dat$ failed$No such file or > directory$|, > qr(WSREP: Quorum: No node with complete state), > qr(WSREP: Initial position was provided by configuration or SST, > avoiding override), > qr|WSREP: discarding established $time wait$ .*|, > qr(WSREP: There are no nodes in the same segment that will ever be > able to become donors, yet there is a suitable donor outside. Will use that > one.), > qr(WSREP: evs::proto.*), > - qr|WSREP: Ignoring possible split-brain (allowed by configuration) > from view:.*|, > + qr|WSREP: Ignoring possible split-brain $allowed by configuration$ > from view:.*|, > + qr(WSREP: no nodes coming from prim view, prim not possible), > + qr(WSREP: Member .* requested state transfer from .* but it is > impossible to select State Transfer donor: Resource temporarily > unavailable), > + qr(WSREP: user message in state LEAVING), > + qr(WSREP: .* sending install message failed: Transport endpoint is > not connected), > + qr(WSREP: .* sending install message failed: Resource temporarily > unavailable), > + qr(WSREP: Maximum writeset size exceeded by .*), > + qr(WSREP: transaction size exceeded.*), > + qr(WSREP: RBR event .*), > + qr(WSREP: Ignoring error for TO isolated action: .*), > + qr(WSREP: transaction size limit .*), > + qr(WSREP: rbr write fail, .*), > + qr(WSREP: .*Backend not supported: foo.*), > + qr(WSREP: .*Failed to initialize backend using .*), > + qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*), > + qr(WSREP: gcs connect failed: Socket type not supported), > + qr(WSREP: failed to open gcomm backend connection: 110: failed to > reach primary view: 110 .*), > + qr(WSREP: .*Failed to open backend connection: -110 .*), > + qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*), > + qr(WSREP: gcs connect failed: Connection timed out), > + qr|WSREP: wsrep::connect$.*$ failed: 7|, > + qr(WSREP: SYNC message from member .* in non-primary configuration. > Ignored.), > qr(WSREP: Could not find peer:), > - qr(WSREP: Protocol violation. JOIN message sender .*), > - qr(WSREP: JOIN message from member [0-9]* in non-primary > configuration. Ignored.), > + qr(WSREP: TO isolation failed for: .*), > + qr|WSREP: gcs_caused returned .*|, > + qr|WSREP: Protocol violation. JOIN message sender .* is not in state > transfer $SYNCED$. Message ignored.|, > + qr(WSREP: Action message in non-primary configuration from member > [0-9]*), > ); > > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

2 1

Re: [Maria-developers] [Commits] 9bd354e: MDEV-11060 sql/protocol.cc:532: void Protocol::end_statement(): Assertion `0' failed
by Sergey Petrunia 13 Dec '16

13 Dec '16

Hi Varun, Please find a small note below. Ok to push after it has been addressed. On Tue, Dec 13, 2016 at 05:09:58AM +0530, Varun wrote: > revision-id: 9bd354ef91ae81e0f997f29acdae4f8a2997b3c8 (mariadb-10.1.19-40-g9bd354e) > parent(s): 67b570af506a42f14a8ae30603d52ca9de68cce5 > author: Varun Gupta > committer: Varun Gupta > timestamp: 2016-12-13 05:07:02 +0530 > message: > > MDEV-11060 sql/protocol.cc:532: void Protocol::end_statement(): Assertion `0' failed > > In file sql/opt_range.cc,when calculate_cond_selectivity_for_table() is called with optimizer_use_condition_selectivity=4 then > - thd->no_errors is set to 1 > - the original value of thd->no_error is not restored to its original value > - this is causing the assertion to fail in the subsequent queries > > Fixed by restoring the original value of thd->no_errors > > --- > mysql-test/r/selectivity_innodb.result | 23 +++++++++++++++++++++++ > mysql-test/t/selectivity_innodb.test | 28 ++++++++++++++++++++++++++++ > sql/opt_range.cc | 1 + > 3 files changed, 52 insertions(+) > > diff --git a/mysql-test/r/selectivity_innodb.result b/mysql-test/r/selectivity_innodb.result > index 4355812..b57873d 100644 > --- a/mysql-test/r/selectivity_innodb.result > +++ b/mysql-test/r/selectivity_innodb.result > @@ -1670,6 +1670,29 @@ DROP TABLE t1,t2; > # > # End of 10.0 tests > # > +# > +# MDEV-11060: sql/protocol.cc:532: void Protocol::end_statement(): Assertion `0' failed > +# > +set optimizer_use_condition_selectivity=4; > +drop table if exists t1, t2; > +Warnings: > +Note 1051 Unknown table 'test.t1' > +Note 1051 Unknown table 'test.t2' > +drop view if exists v1; > +Warnings: > +Note 1051 Unknown table 'test.v1' Please remove 'DROP TABLE IF EXISTS' statements as they are not necessary. The previous test ends with DROP TABLE commands for tables t1, t2. There is no DROP VIEW command, so it is useful that the VIEW is dropped before it is used (just in case the test is run against a server that already has the view). Check out other test files, most of them start with lines like: --disable_warnings drop table if exists t1,t2; --enable_warnings Please also suppress warnings for the DROP VIEW statement. > +create table t1 (a int not null, b int, c int) engine=InnoDB; > +create trigger trgi before insert on t1 for each row set new.a=if(new.a is null,new.b,new.c); > +create table t2 (d int, e int) engine=InnoDB; > +update t1, t2 set a=NULL, b=2, c=NULL where b=d and e=200; > +create view v1 as select * from t1, t2 where d=2; > +insert v1 (a,c) values (NULL, 20); > +ERROR 23000: Column 'a' cannot be null > +drop table t1,t2; > +drop view v1; > +# > +# End of 10.1 tests > +# > set use_stat_tables= @tmp_ust; > set optimizer_use_condition_selectivity= @tmp_oucs; > SET SESSION STORAGE_ENGINE=DEFAULT; > diff --git a/mysql-test/t/selectivity_innodb.test b/mysql-test/t/selectivity_innodb.test > index 25aa0ab..bb87106 100644 > --- a/mysql-test/t/selectivity_innodb.test > +++ b/mysql-test/t/selectivity_innodb.test > @@ -138,6 +138,34 @@ DROP TABLE t1,t2; > --echo # End of 10.0 tests > --echo # > > + > +--echo # > +--echo # MDEV-11060: sql/protocol.cc:532: void Protocol::end_statement(): Assertion `0' failed > +--echo # > + > + > +set optimizer_use_condition_selectivity=4; > + > +drop table if exists t1, t2; > +drop view if exists v1; > + > +create table t1 (a int not null, b int, c int) engine=InnoDB; > +create trigger trgi before insert on t1 for each row set new.a=if(new.a is null,new.b,new.c); > + > +create table t2 (d int, e int) engine=InnoDB; > +update t1, t2 set a=NULL, b=2, c=NULL where b=d and e=200; > + > +create view v1 as select * from t1, t2 where d=2; > +--error ER_BAD_NULL_ERROR > +insert v1 (a,c) values (NULL, 20); > + > +drop table t1,t2; > +drop view v1; > + > +--echo # > +--echo # End of 10.1 tests > +--echo # > + > set use_stat_tables= @tmp_ust; > set optimizer_use_condition_selectivity= @tmp_oucs; > SET SESSION STORAGE_ENGINE=DEFAULT; > diff --git a/sql/opt_range.cc b/sql/opt_range.cc > index bed57f3..0577ef0 100644 > --- a/sql/opt_range.cc > +++ b/sql/opt_range.cc > @@ -3112,6 +3112,7 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item **cond) > } > > free_alloc: > + thd->no_errors= 0; > thd->mem_root= param.old_root; > free_root(&alloc, MYF(0)); > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog

1 0