- developers - lists.mariadb.org

[Maria-developers] UNION + INTO OUTFILE is confusing
by Alexander Barkov 04 May '16

04 May '16

Hi Sergei, If I run this query: SELECT 1 UNION SELECT 2 INTO OUTFILE 'test.txt'; It creates a file 'test.txt' with this content: 1 2 Looks fine so far. Now if I do "rm test.txt" and execute another query (with parentheses): (SELECT 1) UNION (SELECT 2 INTO OUTFILE 'test.txt'); it still puts the same two records from both UNION parts! This looks confusing, as parentheses a kind of assume that only the right UNION part is to be exported. Exporting only one UNION part is not supported, IIRC. So the above query should probably return a syntax error. But now there is a new trouble. There is no syntax like this: (SELECT ...) UNION (SELECT ...) INTO OUTFILE 'test.txt'; So instead of: (SELECT ...) UNION (SELECT ... INTO OUTFILE 'test.txt'); one will have to write this: SELECT * INTO OUTFILE 'test.txt' FROM ((SELECT ...) UNION (SELECT ...)) AS t1; The latter looks longer, but at least it's not confusing as the former.

2 2

Re: [Maria-developers] [Commits] b1ddc7d: MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops with UNION in ALL subquery
by Sergey Petrunia 04 May '16

04 May '16

Hi Sanja, I have one comment: the patch introduces JOIN::in_optimize which can have values of 1) not initialized and 2) false. This is clearly redundant. Ok to push after the above is addressed. On Sun, Feb 21, 2016 at 10:12:25PM +0100, OleksandrByelkin wrote: > revision-id: b1ddc7d546e6b147838af72dd03f86a8b272fdf0 (mariadb-10.1.11-18-gb1ddc7d) > parent(s): fd8e846a3b049903706267d58e6d8e61eea97df8 > committer: Oleksandr Byelkin > timestamp: 2016-02-21 22:12:25 +0100 > message: > > MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops with UNION in ALL subquery > > Do not mark subquery as inexpensive when it is not optimized. > > --- > mysql-test/r/derived_view.result | 6 +++--- > mysql-test/r/subselect.result | 20 +++++++++++++++++--- > mysql-test/r/subselect_no_exists_to_in.result | 20 +++++++++++++++++--- > mysql-test/r/subselect_no_mat.result | 20 +++++++++++++++++--- > mysql-test/r/subselect_no_opts.result | 20 +++++++++++++++++--- > mysql-test/r/subselect_no_scache.result | 20 +++++++++++++++++--- > mysql-test/r/subselect_no_semijoin.result | 20 +++++++++++++++++--- > mysql-test/r/type_year.result | 1 + > mysql-test/t/subselect.test | 11 +++++++++++ > sql/item_subselect.cc | 20 ++++++++++++++++---- > sql/sql_select.h | 2 ++ > 11 files changed, 135 insertions(+), 25 deletions(-) > > diff --git a/mysql-test/r/derived_view.result b/mysql-test/r/derived_view.result > index 639942f..5783247 100644 > --- a/mysql-test/r/derived_view.result > +++ b/mysql-test/r/derived_view.result > @@ -1101,7 +1101,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t3 system NULL NULL NULL NULL 1 100.00 > 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > -Note 1003 select 6 AS `a`,5 AS `b` from `test`.`t3` where (not(<expr_cache><6,5>(<in_optimizer>((6,5),<exists>(select 7,5 having (trigcond(((<cache>(6) = 7) or isnull(7))) and trigcond(((<cache>(5) = 5) or isnull(5))) and trigcond(<is_not_null_test>(7)) and trigcond(<is_not_null_test>(5)))))))) > +Note 1003 select 6 AS `a`,5 AS `b` from `test`.`t3` where 1 > SELECT t.a,t.b FROM t3 RIGHT JOIN ((SELECT * FROM t1) AS t, t2) ON t2.b != 0 > WHERE (t.a,t.b) NOT IN (SELECT 7, 5); > a b > @@ -1115,7 +1115,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t3 system NULL NULL NULL NULL 1 100.00 > 3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > -Note 1003 select 6 AS `a`,5 AS `b` from `test`.`t3` where (not(<expr_cache><6,5>(<in_optimizer>((6,5),<exists>(select 7,5 having (trigcond(((<cache>(6) = 7) or isnull(7))) and trigcond(((<cache>(5) = 5) or isnull(5))) and trigcond(<is_not_null_test>(7)) and trigcond(<is_not_null_test>(5)))))))) > +Note 1003 select 6 AS `a`,5 AS `b` from `test`.`t3` where 1 > SELECT t.a,t.b FROM t3 RIGHT JOIN (v1 AS t, t2) ON t2.b != 0 > WHERE (t.a,t.b) NOT IN (SELECT 7, 5); > a b > @@ -1129,7 +1129,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t3 system NULL NULL NULL NULL 1 100.00 > 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > -Note 1003 select 6 AS `a`,5 AS `b` from `test`.`t3` where (not(<expr_cache><6,5>(<in_optimizer>((6,5),<exists>(select 7,5 having (trigcond(((<cache>(6) = 7) or isnull(7))) and trigcond(((<cache>(5) = 5) or isnull(5))) and trigcond(<is_not_null_test>(7)) and trigcond(<is_not_null_test>(5)))))))) > +Note 1003 select 6 AS `a`,5 AS `b` from `test`.`t3` where 1 > DROP VIEW v1; > DROP TABLE t1,t2,t3; > # > diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result > index 75c8597..90d8f9f 100644 > --- a/mysql-test/r/subselect.result > +++ b/mysql-test/r/subselect.result > @@ -6805,7 +6805,9 @@ FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > +1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > @@ -6817,8 +6819,8 @@ SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > -1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > @@ -7133,3 +7135,15 @@ sq > NULL > drop view v2; > drop table t1,t2; > +# > +# MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops > +# with UNION in ALL subquery > +# > +SET NAMES utf8; > +CREATE TABLE t1 (f VARCHAR(8)) ENGINE=MyISAM; > +INSERT INTO t1 VALUES ('foo'); > +SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' ); > +f > +foo > +drop table t1; > +SET NAMES default; > diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result > index e6238af..dcceb61 100644 > --- a/mysql-test/r/subselect_no_exists_to_in.result > +++ b/mysql-test/r/subselect_no_exists_to_in.result > @@ -6805,7 +6805,9 @@ FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > +1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > @@ -6817,8 +6819,8 @@ SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > -1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > @@ -7133,6 +7135,18 @@ sq > NULL > drop view v2; > drop table t1,t2; > +# > +# MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops > +# with UNION in ALL subquery > +# > +SET NAMES utf8; > +CREATE TABLE t1 (f VARCHAR(8)) ENGINE=MyISAM; > +INSERT INTO t1 VALUES ('foo'); > +SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' ); > +f > +foo > +drop table t1; > +SET NAMES default; > set optimizer_switch=default; > select @@optimizer_switch like '%exists_to_in=off%'; > @@optimizer_switch like '%exists_to_in=off%' > diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result > index 70edc64..4e9f750 100644 > --- a/mysql-test/r/subselect_no_mat.result > +++ b/mysql-test/r/subselect_no_mat.result > @@ -6800,7 +6800,9 @@ FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > +1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > @@ -6812,8 +6814,8 @@ SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > -1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > @@ -7126,6 +7128,18 @@ sq > NULL > drop view v2; > drop table t1,t2; > +# > +# MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops > +# with UNION in ALL subquery > +# > +SET NAMES utf8; > +CREATE TABLE t1 (f VARCHAR(8)) ENGINE=MyISAM; > +INSERT INTO t1 VALUES ('foo'); > +SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' ); > +f > +foo > +drop table t1; > +SET NAMES default; > set optimizer_switch=default; > select @@optimizer_switch like '%materialization=on%'; > @@optimizer_switch like '%materialization=on%' > diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result > index c89fd13..4b09fd2 100644 > --- a/mysql-test/r/subselect_no_opts.result > +++ b/mysql-test/r/subselect_no_opts.result > @@ -6796,7 +6796,9 @@ FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > +1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > @@ -6808,8 +6810,8 @@ SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > -1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > @@ -7124,4 +7126,16 @@ sq > NULL > drop view v2; > drop table t1,t2; > +# > +# MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops > +# with UNION in ALL subquery > +# > +SET NAMES utf8; > +CREATE TABLE t1 (f VARCHAR(8)) ENGINE=MyISAM; > +INSERT INTO t1 VALUES ('foo'); > +SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' ); > +f > +foo > +drop table t1; > +SET NAMES default; > set @optimizer_switch_for_subselect_test=null; > diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result > index b12bf21..322e64d 100644 > --- a/mysql-test/r/subselect_no_scache.result > +++ b/mysql-test/r/subselect_no_scache.result > @@ -6811,7 +6811,9 @@ FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > +1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > @@ -6823,8 +6825,8 @@ SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > -1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > @@ -7139,6 +7141,18 @@ sq > NULL > drop view v2; > drop table t1,t2; > +# > +# MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops > +# with UNION in ALL subquery > +# > +SET NAMES utf8; > +CREATE TABLE t1 (f VARCHAR(8)) ENGINE=MyISAM; > +INSERT INTO t1 VALUES ('foo'); > +SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' ); > +f > +foo > +drop table t1; > +SET NAMES default; > set optimizer_switch=default; > select @@optimizer_switch like '%subquery_cache=on%'; > @@optimizer_switch like '%subquery_cache=on%' > diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result > index 54f145d..d380528 100644 > --- a/mysql-test/r/subselect_no_semijoin.result > +++ b/mysql-test/r/subselect_no_semijoin.result > @@ -6796,7 +6796,9 @@ FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > +1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > @@ -6808,8 +6810,8 @@ SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > -1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > +1 PRIMARY alias1 index a a 19 NULL 11 Using index > +1 PRIMARY alias2 index a a 19 NULL 11 Using where; Using index; Using join buffer (flat, BNL join) > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > 2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > @@ -7124,5 +7126,17 @@ sq > NULL > drop view v2; > drop table t1,t2; > +# > +# MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops > +# with UNION in ALL subquery > +# > +SET NAMES utf8; > +CREATE TABLE t1 (f VARCHAR(8)) ENGINE=MyISAM; > +INSERT INTO t1 VALUES ('foo'); > +SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' ); > +f > +foo > +drop table t1; > +SET NAMES default; > set @optimizer_switch_for_subselect_test=null; > set @join_cache_level_for_subselect_test=NULL; > diff --git a/mysql-test/r/type_year.result b/mysql-test/r/type_year.result > index 842a16e..204cec2 100644 > --- a/mysql-test/r/type_year.result > +++ b/mysql-test/r/type_year.result > @@ -387,6 +387,7 @@ a > 00 > select a from t1 where a=(select 2000 from dual where 1); > a > +00 > select a from t1 where a=y2k(); > a > 00 > diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test > index a862870..f71c215 100644 > --- a/mysql-test/t/subselect.test > +++ b/mysql-test/t/subselect.test > @@ -5989,3 +5989,14 @@ SELECT ( SELECT MIN(v2.f2) FROM t1 ) AS sq FROM v2 GROUP BY sq; > > drop view v2; > drop table t1,t2; > + > +--echo # > +--echo # MDEV-9487: Server crashes in Time_and_counter_tracker::incr_loops > +--echo # with UNION in ALL subquery > +--echo # > +SET NAMES utf8; > +CREATE TABLE t1 (f VARCHAR(8)) ENGINE=MyISAM; > +INSERT INTO t1 VALUES ('foo'); > +SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' ); > +drop table t1; > +SET NAMES default; > diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc > index d4e3e6c..f45d83d 100644 > --- a/sql/item_subselect.cc > +++ b/sql/item_subselect.cc > @@ -561,22 +561,34 @@ bool Item_subselect::is_expensive() > for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select()) > { > JOIN *cur_join= sl->join; > + > + /* not optimized subquery */ > if (!cur_join) > - continue; > + return true; > + > + /* very simple subquery */ > + if (!cur_join->tables_list && !sl->first_inner_unit()) > + return false; > + > + /* > + If the subquery is not optimised or in the process of optimization > + it supposed to be expensive > + */ > + if (!cur_join->optimized || cur_join->in_optimize) > + return true; > > /* > Subqueries whose result is known after optimization are not expensive. > Such subqueries have all tables optimized away, thus have no join plan. > */ > - if (cur_join->optimized && > - (cur_join->zero_result_cause || !cur_join->tables_list)) > + if ((cur_join->zero_result_cause || !cur_join->tables_list)) > return false; > > /* > If a subquery is not optimized we cannot estimate its cost. A subquery is > considered optimized if it has a join plan. > */ > - if (!(cur_join->optimized && cur_join->join_tab)) > + if (!cur_join->join_tab) > return true; > > if (sl->first_inner_unit()) > diff --git a/sql/sql_select.h b/sql/sql_select.h > index 9f90473..e57844fd 100644 > --- a/sql/sql_select.h > +++ b/sql/sql_select.h > @@ -1292,6 +1292,7 @@ class JOIN :public Sql_alloc > OPTIMIZATION_IN_PROGRESS=1, > OPTIMIZATION_DONE=2}; > bool optimized; ///< flag to avoid double optimization in EXPLAIN > + bool in_optimize; > bool initialized; ///< flag to avoid double init_execution calls > > Explain_select *explain; > @@ -1380,6 +1381,7 @@ class JOIN :public Sql_alloc > ref_pointer_array_size= 0; > zero_result_cause= 0; > optimized= 0; > + in_optimize= 0; > have_query_plan= QEP_NOT_PRESENT_YET; > initialized= 0; > cleaned= 0; BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog

3 2

Re: [Maria-developers] c75cbc1: MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and
by Sergei Golubchik 04 May '16

04 May '16

Hi, Alexey! convention below: when I start a comment with "btw" it means that you don't need to change anything, it's just a thought I had when looking at that line in the patch. On May 03, Alexey Botchkov wrote: > revision-id: c75cbc19806223be8e750c27ba0bd4b17ef61f54 (mariadb-10.1.13-24-gc75cbc1) > parent(s): 94cd0f6c9b3b04db67501ef29d470f32527ceda2 > committer: Alexey Botchkov > timestamp: 2016-05-03 13:20:12 +0400 > message: > > MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and > CREATE function. > > Test case added. That required setting some DEBUG_SYNC points. > > diff --git a/mysql-test/suite/binlog/t/binlog_mdev717.test b/mysql-test/suite/binlog/t/binlog_mdev717.test > new file mode 100644 > index 0000000..5e8cce6 > --- /dev/null > +++ b/mysql-test/suite/binlog/t/binlog_mdev717.test > @@ -0,0 +1,49 @@ > +# MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and CREATE function. > + > +--source include/have_log_bin.inc > +RESET MASTER; > + > +disable_warnings; > +DROP DATABASE IF EXISTS mysqltest; > +enable_warnings; btw, generally this isn't necessary anymore, after-test checks verify that every test cleans up after itself. > +connect(con1,localhost,root,,); btw, this works also without extra commas: connect(con1,localhost,root); > +connection default; > + > +CREATE DATABASE mysqltest; > +SET DEBUG_SYNC= "wait_drop_db_name_locked SIGNAL locked WAIT_FOR release"; > +--send DROP DATABASE mysqltest; > +connection con1; > +SET DEBUG_SYNC= "now WAIT_FOR locked"; Hm... If the default connection signals "locked" before you start waiting for it now - will your test still work? You can test it by adding a sleep right after "connection con1". (don't commit the sleep, of course, it's just to way to verify whether the test case is valid) Alternatively, in many places tests wait for a connection to reach the certain debug_sync point with, like: let $wait_condition= select count(*) = 1 from information_schema.processlist where state like "debug sync point: wait_drop_db_name_locked%"; source include/wait_condition.inc; > +SET DEBUG_SYNC= "sp_create_routine_started SIGNAL release"; > +--error 0,ER_BAD_DB_ERROR why? Do you mean that even with your sync points the specific execution order if not guaranteed? > +CREATE FUNCTION mysqltest.f1() RETURNS INT RETURN 1; > +connection default; > +--reap > + > +CREATE DATABASE mysqltest; > +SET DEBUG_SYNC= "wait_drop_db_name_locked SIGNAL locked1 WAIT_FOR release1"; > +--send DROP DATABASE mysqltest; > +connection con1; > +SET DEBUG_SYNC= "now WAIT_FOR locked1"; > +SET DEBUG_SYNC= "create_event_started SIGNAL release1"; > +--error 0,ER_BAD_DB_ERROR > +CREATE EVENT mysqltest.e1 ON SCHEDULE EVERY 15 MINUTE DO BEGIN END; > +connection default; > +--reap > + > +CREATE DATABASE mysqltest; > +CREATE EVENT mysqltest.e1 ON SCHEDULE EVERY 15 MINUTE DO BEGIN END; > +SET DEBUG_SYNC= "wait_drop_db_name_locked SIGNAL locked1 WAIT_FOR release1"; > +--send DROP DATABASE mysqltest; > +connection con1; > +SET DEBUG_SYNC= "now WAIT_FOR locked1"; > +SET DEBUG_SYNC= "update_event_started SIGNAL release1"; > +--error 0,ER_BAD_DB_ERROR > +ALTER EVENT mysqltest.e1 ON SCHEDULE EVERY 20 MINUTE DO BEGIN END; > +connection default; > +--reap > + > +SET DEBUG_SYNC= "RESET"; > +--source include/show_binlog_events.inc > + > diff --git a/sql/events.cc b/sql/events.cc > index 77dbb8b..3c50d6e 100644 > diff --git a/sql/sp.cc b/sql/sp.cc > index a518b52..c2e3fd2 100644 > --- a/sql/sp.cc > +++ b/sql/sp.cc > @@ -1043,6 +1043,8 @@ sp_create_routine(THD *thd, stored_procedure_type type, sp_head *sp) > DBUG_ASSERT(type == TYPE_ENUM_PROCEDURE || > type == TYPE_ENUM_FUNCTION); > > + DEBUG_SYNC(thd, "sp_create_routine_started"); > + could you use "before_wait_locked_pname" sync point instead? It's at the beginning of lock_object_name(). > /* Grab an exclusive MDL lock. */ > if (lock_object_name(thd, mdl_type, sp->m_db.str, sp->m_name.str)) > { > diff --git a/sql/sql_db.cc b/sql/sql_db.cc > index 2ba67cb..fdb49f2 100644 > --- a/sql/sql_db.cc > +++ b/sql/sql_db.cc > @@ -837,6 +837,8 @@ mysql_rm_db_internal(THD *thd,char *db, bool if_exists, bool silent) > if (lock_schema_name(thd, dbnorm)) > DBUG_RETURN(true); > > + DEBUG_SYNC(thd, "wait_drop_db_name_locked"); > + Could you use "after_wait_locked_schema_name" sync point instead? It's the one at the end of lock_schema_name(). > length= build_table_filename(path, sizeof(path) - 1, db, "", "", 0); > strmov(path+length, MY_DB_OPT_FILE); // Append db option file name > del_dbopt(path); // Remove dboption hash entry Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

2 3

Re: [Maria-developers] [Commits] a6fb98f: MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno
by Jan Lindström 03 May '16

03 May '16

Hi Nirbhay, I'm not expert on this code area but some questions, comments below. On Tue, May 3, 2016 at 1:26 AM, Nirbhay Choubey <nirbhay(a)mariadb.com> wrote: > revision-id: a6fb98fd74ab6f14fab0c1ef4630b010ff28880f > (mariadb-10.1.13-6-ga6fb98f) > parent(s): f8cdb9e7e8fb692f8eb3b9bb4792cd60653e0eb8 > author: Nirbhay Choubey > committer: Nirbhay Choubey > timestamp: 2016-05-02 18:26:58 -0400 > message: > > MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno > > - Validate the specified wsrep_start_position value by also > checking the return status of wsrep->sst_received. This also > ensures that changes in wsrep_start_position is not allowed > when the node is not in JOINING state. > - Do not allow decrease in seqno within same UUID. > - The initial checkpoint in SEs should be [0...:-1]. > > > diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc > index 4f6cc51..44fdd03 100644 > --- a/sql/wsrep_sst.cc > +++ b/sql/wsrep_sst.cc > @@ -264,42 +264,91 @@ void wsrep_sst_complete (const wsrep_uuid_t* > sst_uuid, > mysql_mutex_unlock (&LOCK_wsrep_sst); > } > > -void wsrep_sst_received (wsrep_t* const wsrep, > +/* > + If wsrep provider is loaded, inform that the new state snapshot > + has been received. Also update the local checkpoint. > + > + @param wsrep [IN] wsrep handle > + @param uuid [IN] Initial state UUID > + @param seqno [IN] Initial state sequence number > + @param state [IN] Always NULL, also ignored by wsrep > provider (?) > + @param state_len [IN] Always 0, also ignored by wsrep > provider (?) > + @param implicit [IN] Whether invoked implicitly due to > SST > + (true) or explicitly because if > change > + in wsrep_start_position by user > (false). > + @return false Success > + true Error > + > +*/ > +bool wsrep_sst_received (wsrep_t* const wsrep, > const wsrep_uuid_t& uuid, > wsrep_seqno_t const seqno, > const void* const state, > - size_t const state_len) > Why not const size_t state_len ? Use of const here is confusing. > + size_t const state_len, > + bool const implicit) > { > - wsrep_get_SE_checkpoint(local_uuid, local_seqno); > + /* > + To keep track of whether the local uuid:seqno should be updated. > Also, note > + that local state (uuid:seqno) is updated/checkpointed only after we > get an > + OK from wsrep provider. By doing so, the values remain consistent > across > + the server & wsrep provider. > + */ > + bool do_update= false; > + > + // Get the locally stored uuid:seqno. > + wsrep_get_SE_checkpoint(local_uuid, local_seqno); > What if this fails, no error handling ? > > - if (memcmp(&local_uuid, &uuid, sizeof(wsrep_uuid_t)) || > - local_seqno < seqno || seqno < 0) > + if (memcmp(&local_uuid, &uuid, sizeof(wsrep_uuid_t)) || > + local_seqno < seqno) > + { > + do_update= true; > + } > + else if (local_seqno > seqno) > + { > + WSREP_WARN("SST position can't be set in past. Requested: %lld, > Current: " > + " %lld.", (long long)seqno, (long long)local_seqno); > + /* > + If we are here because of SET command, simply return true (error) > instead of > + aborting. > + */ > + if (implicit) > { > - wsrep_set_SE_checkpoint(uuid, seqno); > - local_uuid = uuid; > - local_seqno = seqno; > + WSREP_WARN("Can't continue."); > + unireg_abort(1); > } > - else if (local_seqno > seqno) > + else > { > - WSREP_WARN("SST postion is in the past: %lld, current: %lld. " > - "Can't continue.", > - (long long)seqno, (long long)local_seqno); > - unireg_abort(1); > + return true; > } > + } > > #ifdef GTID_SUPPORT > - wsrep_init_sidno(uuid); > + wsrep_init_sidno(uuid); > #endif /* GTID_SUPPORT */ > > - if (wsrep) > - { > - int const rcode(seqno < 0 ? seqno : 0); > - wsrep_gtid_t const state_id = { > - uuid, (rcode ? WSREP_SEQNO_UNDEFINED : seqno) > - }; > + if (wsrep) > + { > + int const rcode(seqno < 0 ? seqno : 0); > When seqno can be < 0 ? > + wsrep_gtid_t const state_id= {uuid, > + (rcode ? WSREP_SEQNO_UNDEFINED : seqno)}; > + > + wsrep_status_t ret= wsrep->sst_received(wsrep, &state_id, state, > + state_len, rcode); > > - wsrep->sst_received(wsrep, &state_id, state, state_len, rcode); > + if (ret != WSREP_OK) > + { > + return true; > } > + } > + > + // Now is the good time to update the local state and checkpoint. > + if (do_update) { > + wsrep_set_SE_checkpoint(uuid, seqno); > Again, I would add error handling. > + local_uuid= uuid; > + local_seqno= seqno; > + } > + > + return false; > } > > // Let applier threads to continue > @@ -308,7 +357,7 @@ void wsrep_sst_continue () > if (sst_needed) > { > WSREP_INFO("Signalling provider to continue."); > - wsrep_sst_received (wsrep, local_uuid, local_seqno, NULL, 0); > + wsrep_sst_received (wsrep, local_uuid, local_seqno, NULL, 0, true); > You should check the return code. > } > } > > diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc > index 9c01e54..bd94190 100644 > > > bool wsrep_start_position_update (sys_var *self, THD* thd, enum_var_type > type) > { > - WSREP_INFO ("wsrep_start_position var submitted: '%s'", > - wsrep_start_position); > - // since this value passed wsrep_start_position_check, don't check > anything > - // here > - wsrep_set_local_position (wsrep_start_position, true); > - return 0; > + // Print a confirmation that wsrep_start_position has been updated. > + WSREP_INFO ("wsrep_start_position set to '%s'", wsrep_start_position); > + return false; > Hmm, normally I thought that system variable set would go like if (variable_check()) variable_update() but now update does not do nothing ? > } > void wsrep_start_position_init (const char* val) > @@ -164,7 +194,7 @@ void wsrep_start_position_init (const char* val) > return; > } > > - wsrep_set_local_position (val, false); > + wsrep_set_local_position (val, strlen(val), false); > Add error handling. > } > > static bool refresh_provider_options() > diff --git a/storage/innobase/trx/trx0sys.cc > b/storage/innobase/trx/trx0sys.cc > index 76c8613..1625e8d 100644 > --- a/storage/innobase/trx/trx0sys.cc > +++ b/storage/innobase/trx/trx0sys.cc > @@ -349,10 +349,10 @@ void read_wsrep_xid_uuid(const XID* xid, unsigned > char* buf) > unsigned char xid_uuid[16]; > long long xid_seqno = read_wsrep_xid_seqno(xid); > read_wsrep_xid_uuid(xid, xid_uuid); > - if (!memcmp(xid_uuid, trx_sys_cur_xid_uuid, 8)) > + if (!memcmp(xid_uuid, trx_sys_cur_xid_uuid, 16) && > + (xid_seqno > -1)) > Does this mean that you ignore uuid if it is exactly the same, or is there error handling on else? R: Jan

2 1

[Maria-developers] GSoC 2016 GTID support for MariaDB MHA
by Charles Dirk 03 May '16

03 May '16

Hi everyone, I have created a wordpress blog HERE <https://mariadbmhagtidgsoc2016.wordpress.com/> on which I will post regularly about my progress with this project. Feel free to check it out. Cheers, Charles.

1 0

[Maria-developers] GSoC Community Bonding
by Rebecca Tucker 03 May '16

03 May '16

Hi Everyone, I am Becca and I will be working with Lixun Peng as mentor on adding support for GTID in the mysqlbinlog tool for GSoC 2016. I will base my work on 10.1 which I have cloned and build successfully on OS X El Capitan. I am currently studying the mysqlbinlog.cc code to see how we can extend the my_options array for GTID support and next I will study the GTID code to understand its data structures. I look forward to an awesome summer at the MariaDB foundation and thanks for giving me this opportunity. Cheers, Becca.

2 1

Re: [Maria-developers] ad8b439: MDEV-9618 solaris sparc build fails on 10.1.
by Sergei Golubchik 03 May '16

03 May '16

Hi, Alexey! On May 02, Alexey Botchkov wrote: > revision-id: ad8b4399f2fcd1d5e9dcdb8b2a8832cb3a6745ae (mariadb-10.1.13-23-gad8b439) > parent(s): ad4239cc3dc7ad5f6f264e1fb3cf6d24084bda90 > committer: Alexey Botchkov > timestamp: 2016-05-02 12:03:39 +0400 > message: > > MDEV-9618 solaris sparc build fails on 10.1. > > Compiler on Solaris is sensitive to C/C++ call models > differences, so it fails if we try to mix these two in > '?' operator. > Fixed by trying to keep the call models uniformity with the > proper amount of 'extern "C"' hints. > > --- > include/my_crypt.h | 6 ++++++ > include/mysql/plugin_audit.h | 7 +++++++ > include/mysql/plugin_encryption.h | 9 +++++++++ > .../example_key_management_plugin.cc | 2 +- > plugin/file_key_management/file_key_management_plugin.cc | 2 +- > sql/encryption.cc | 14 ++++++++++---- > unittest/sql/mf_iocache-t.cc | 2 +- > 7 files changed, 35 insertions(+), 7 deletions(-) > > diff --git a/include/my_crypt.h b/include/my_crypt.h > index e1e94c9..db280ca 100644 > --- a/include/my_crypt.h > +++ b/include/my_crypt.h > @@ -82,6 +82,12 @@ static inline uint my_aes_ctx_size(enum my_aes_mode mode __attribute__((unused)) > return MY_AES_CTX_SIZE; > } > > +static inline uint my_aes_ctx_size_for_handler(unsigned int a, > + unsigned int b __attribute__((unused))) > +{ > + return my_aes_ctx_size((enum my_aes_mode) a); > +} > + This won't be inlined, because you store a pointer to this function in a structure. Better use the cast, as before. > int my_random_bytes(uchar* buf, int num); > > #ifdef __cplusplus > diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h > index 31589f0..e96f743 100644 > --- a/include/mysql/plugin_audit.h > +++ b/include/mysql/plugin_audit.h > @@ -23,6 +23,10 @@ > > #include "plugin.h" > > +#ifdef __cplusplus > +extern "C" { > +#endif I agree, in general. But why does your short patch have nothing about audit api? > #define MYSQL_AUDIT_CLASS_MASK_SIZE 1 > > #define MYSQL_AUDIT_INTERFACE_VERSION 0x0302 > @@ -174,5 +178,8 @@ struct st_mysql_audit > unsigned long class_mask[MYSQL_AUDIT_CLASS_MASK_SIZE]; > }; > > +#ifdef __cplusplus > +} > +#endif > > #endif > diff --git a/include/mysql/plugin_encryption.h b/include/mysql/plugin_encryption.h > index 3f35c2b..d748c4f 100644 > --- a/include/mysql/plugin_encryption.h > +++ b/include/mysql/plugin_encryption.h > @@ -27,6 +27,10 @@ > > #include <mysql/plugin.h> > > +#ifdef __cplusplus > +extern "C" { > +#endif ...etc I agree that these extern "C" are the correct fix. On the other hand, I don't see a point in moving casts from the assignment to a new variable definition. So, I'd suggest to keep all extern "C" hunks in the patch, but remove cast avoidance changes. Then ok to push! Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

2 2

Re: [Maria-developers] 9058071: MDEV-9362: InnoDB tables using DATA_DIRECTORY created using MySQL 5.6 do not work with MariaDB 10.1
by Sergei Golubchik 02 May '16

02 May '16

Hi, Jan! I have various comments, see below. Nothing big, nothing that's really the approach you've taken. In fact, I like where it's going. But this is a huge and intrusive patch. I wonder, should we rather do it in 10.2? See below, you yourself write: On Feb 25, Jan Lindström wrote: > > Caution: Please take backups of your database before migrating 10.1.12. This is not what users normally do when upgrading from a GA version to the next minor GA version. Anyway, see comments about the patch below: > diff --git a/mysql-test/suite/encryption/r/innodb-bad-key-change.result b/mysql-test/suite/encryption/r/innodb-bad-key-change.result > index cf97918..39e08f4 100644 > --- a/mysql-test/suite/encryption/r/innodb-bad-key-change.result > +++ b/mysql-test/suite/encryption/r/innodb-bad-key-change.result > @@ -36,8 +36,7 @@ SELECT * FROM t1; > ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB > SHOW WARNINGS; > Level Code Message > -Warning 1812 Tablespace is missing for table 'test/t1' > -Warning 192 Table test/t1 is encrypted but encryption service or used key_id 2 is not available. Can't continue reading table. > +Warning 192 Table test/t1 is encrypted but encryption service or used key_id is not available. Can't continue reading table. why did that happen? > Error 1296 Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB > DROP TABLE t1; > # Start server with keys.txt > diff --git a/storage/innobase/include/dict0tableoptions.h b/storage/innobase/include/dict0tableoptions.h > new file mode 100644 > index 0000000..def0e39 > --- /dev/null > +++ b/storage/innobase/include/dict0tableoptions.h > @@ -0,0 +1,127 @@ > +/***************************************************************************** > + > +Copyright (c) 2016, MariaDB Corporation. > + > +This program is free software; you can redistribute it and/or modify it under > +the terms of the GNU General Public License as published by the Free Software > +Foundation; version 2 of the License. > + > +This program is distributed in the hope that it will be useful, but WITHOUT > +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS > +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. > + > +You should have received a copy of the GNU General Public License along with > +this program; if not, write to the Free Software Foundation, Inc., > +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA > + > +*****************************************************************************/ > + > +/**************************************************//** > +@file include/dict0tableoptions.h > +Definitions for the system table SYS_TABLE_OPTIONS > + > +Created 22/01/2006 Jan Lindström > +*******************************************************/ > + > +#ifndef dict0tableoptions_h > +#define dict0tableoptions_h > + > +#include "univ.i" > + > +/** Data structure to hold contents of SYS_TABLE_OPTIONS */ This is a move in the interesting direction. One of the ideas I was toying with for a few years is to remove .frm files for InnoDB tables. In MariaDB a storage engine can live without frm files if the engine supports table discovery. This is rather easy to implement, but InnoDB does not store the complete table definition, so the discovery will be lossy. Now with your SYS_TABLE_OPTIONS table we're getting closer to having the complete table definition saved inside InnoDB. And one step closer to frm-less InnoDB tables. > +struct dict_tableoptions_t{ > + table_id_t table_id; why do you need table_id in the option structure? > + /* true if table page compressed */ > + bool page_compressed; > + /* Used compression level if set */ > + ulonglong page_compression_level; > + /* dict0types.h: ATOMIC_WRITES_DEFAULT, _ON, or _OFF */ > + atomic_writes_t atomic_writes; > + /* fil0crypt.h: FIL_SPACE_ENCRYPTION_DEFAULT, _ON, or _OFF */ > + fil_encryption_t encryption; > + /* Used encryption key identifier if set */ > + ulonglong encryption_key_id; > + /* true if table options need to be stored */ why wouldn't they need to be? > + bool need_stored; > +}; > + > +/********************************************************************//** > +This function parses a SYS_TABLE_OPTIONS record, extracts necessary > +information from the record and returns it to the caller. > +@return error message or NULL if successfull */ > +UNIV_INTERN > +const char* > +dict_process_sys_tableoptions( > +/*==========================*/ > + mem_heap_t* heap, /*!< in/out: heap memory */ > + const rec_t* rec, /*!< in: current SYS_TABLE_OPTIONS rec */ > + dict_tableoptions_t* table_options); /*!< out: table options */ > + > +/********************************************************************//** > +Gets the table options from SYS_TABLE_OPTIONS based on table_id > +@return true if found, false if not found */ > +UNIV_INTERN > +bool > +dict_get_table_options( > +/*===================*/ > + table_id_t table_id, /*!< in: table id */ > + dict_tableoptions_t* options, /*!< out:table options */ > + bool fixed); /*!< in: can we fix the > + dictionary ? */ > + > +/********************************************************************//** > +Gets the table options from SYS_TABLE_OPTIONS > +@return true if found, false if not found */ > +UNIV_INTERN > +bool > +dict_get_table_options( > +/*===================*/ > + dict_table_t* table, /*!< in/out: table */ > + bool fixed); /*!< in: can we fix the > + dictionary ? */ > + > +/********************************************************************//** > +Update the record in SYS_TABLE_OPTIONS. > +@return DB_SUCCESS if OK, dberr_t if the update failed */ > +UNIV_INTERN > +dberr_t > +dict_update_tableoptions( > +/*=====================*/ > + const dict_table_t* table); /*!< in: table object */ > + > +/********************************************************************//** > +Insert record into SYS_TABLE_OPTIONS > +@return DB_SUCCESS if OK, dberr_t if the insert failed */ > +UNIV_INTERN > +dberr_t > +dict_insert_tableoptions( > +/*=====================*/ > + const dict_table_t* table, /*!< in: table object */ > + bool fixed); /*!< in: can we fix the > + dictionary ? */ > + > +/********************************************************************//** > +Update the table flags in SYS_TABLES. > +@return DB_SUCCESS if OK, dberr_t if the update failed */ > +UNIV_INTERN > +dberr_t > +dict_update_table_flags( > +/*=====================*/ > + const dict_table_t* table, /*!< in: table object */ > + bool fixed); /*!< in: can we fix the > + dictionary ? */ > + > +/********************************************************************//** > +Delete the record in SYS_TABLE_OPTIONS. > +@return DB_SUCCESS if OK, dberr_t if the update failed */ > +UNIV_INTERN > +dberr_t > +dict_delete_tableoptions( > +/*=====================*/ > + const dict_table_t* table, /*!< in: table object */ > + trx_t* trx, /*!< in: trx */ > + bool fixed); /*!< in: can we fix the > + dictionary ? */ > + > +#endif /* dict0tableoptions_h */ > + > diff --git a/storage/innobase/dict/dict0tableoptions.cc b/storage/innobase/dict/dict0tableoptions.cc > new file mode 100644 > index 0000000..527c5e3 > --- /dev/null > +++ b/storage/innobase/dict/dict0tableoptions.cc > @@ -0,0 +1,482 @@ > +/***************************************************************************** > + > +Copyright (c) 2016, MariaDB Corporation. > + > +This program is free software; you can redistribute it and/or modify it under > +the terms of the GNU General Public License as published by the Free Software > +Foundation; version 2 of the License. > + > +This program is distributed in the hope that it will be useful, but WITHOUT > +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS > +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. > + > +You should have received a copy of the GNU General Public License along with > +this program; if not, write to the Free Software Foundation, Inc., > +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA > + > +*****************************************************************************/ > + > +/**************************************************//** > +@file dict/dict0tableoptions.cc > +Function implementations for the system table SYS_TABLE_OPTIONS > + > +Created 22/01/2006 Jan Lindström > +*******************************************************/ > + > +#include "mysql_version.h" > +#include "btr0pcur.h" > +#include "btr0btr.h" > +#include "page0page.h" > +#include "mach0data.h" > +#include "dict0dict.h" > +#include "dict0boot.h" > +#include "dict0stats.h" > +#include "dict0mem.h" > +#include "rem0cmp.h" > +#include "srv0start.h" > +#include "srv0srv.h" > +#include "dict0crea.h" > +#include "dict0priv.h" > +#include "ha_prototypes.h" /* innobase_casedn_str() */ > +#include "fts0priv.h" > +#include "dict0tableoptions.h" > +#include "dict0load.h" > +#include "row0mysql.h" > + > +/********************************************************************//** > +This function parses a SYS_TABLE_OPTIONS record, extracts necessary > +information from the record and returns it to the caller. > +@return error message or NULL if successfull */ > +UNIV_INTERN > +const char* > +dict_process_sys_tableoptions( > +/*==========================*/ > + mem_heap_t* heap, /*!< in/out: heap memory */ > + const rec_t* rec, /*!< in: current SYS_TABLE_OPTIONS rec */ > + dict_tableoptions_t* table_options) /*!< out: table options */ > +{ > + const byte* field; > + ulint len=0; > + > + if (rec_get_deleted_flag(rec, 0)) { > + return("delete-marked record in SYS_TABLE_OPTIONS"); > + } > + > + if (rec_get_n_fields_old(rec) != DICT_NUM_FIELDS__SYS_TABLEOPTIONS) { > + return("wrong number of columns in SYS_TABLE_OPTIONS record"); > + } How does it work future-wise? How do you add new options to the table, say, in 10.2? > diff --git a/storage/innobase/api/api0api.cc b/storage/innobase/api/api0api.cc > index 739ea9f..4af32a5 100644 > --- a/storage/innobase/api/api0api.cc > +++ b/storage/innobase/api/api0api.cc > @@ -270,7 +271,7 @@ ib_open_table_by_name( > dict_table_t* table; > > table = dict_table_open_on_name(name, FALSE, FALSE, > - DICT_ERR_IGNORE_NONE); > + DICT_ERR_IGNORE_NONE, NULL); What does that mean that you pass NULL as the last argument? You won't know whether the table is encrypted or compressed - so you, basically won't be able to read the table? > > if (table != NULL && table->ibd_file_missing) { > table = NULL; > diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc > index f4e7c0d..f1953af 100644 > --- a/storage/innobase/buf/buf0buf.cc > +++ b/storage/innobase/buf/buf0buf.cc > @@ -4677,7 +4678,7 @@ buf_page_io_complete( > "However key management plugin or used key_id %lu is not found or" > " used encryption algorithm or method does not match." > " Can't continue opening the table.", > - bpage->key_version); > + bpage->space, bpage->key_version); This seems to be an unrelated bugfix. And it seems to be already fixed in the latest 10.1 > > if (bpage->space > TRX_SYS_SPACE) { > if (corrupted) { > diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc > index 2b72835..13f1ee6 100644 > --- a/storage/innobase/dict/dict0dict.cc > +++ b/storage/innobase/dict/dict0dict.cc > @@ -1187,6 +1189,16 @@ dict_table_open_on_name( > > /* If table is encrypted return table */ > if (ignore_err == DICT_ERR_IGNORE_NONE > + && !table->is_encrypted && options) { hmm, where else table->is_encrypted can be set? > + if ((options->encryption == FIL_SPACE_ENCRYPTION_ON || > + (options->encryption == FIL_SPACE_ENCRYPTION_DEFAULT && srv_encrypt_tables)) > + && !encryption_key_id_exists((unsigned int)options->encryption_key_id)) { > + table->is_encrypted = true; > + } > + } > + > + /* If table is encrypted return table */ > + if (ignore_err == DICT_ERR_IGNORE_NONE > && table->is_encrypted) { > /* Make life easy for drop table. */ > if (table->can_be_evicted) { > diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc > index d8bd0a6..2b732f1 100644 > --- a/storage/innobase/dict/dict0load.cc > +++ b/storage/innobase/dict/dict0load.cc > @@ -56,7 +64,8 @@ static const char* SYSTEM_TABLE_NAME[] = { > "SYS_FOREIGN", > "SYS_FOREIGN_COLS", > "SYS_TABLESPACES", > - "SYS_DATAFILES" > + "SYS_DATAFILES", > + "SYS_TABLE_OPTIONS" May be "SYS_MARIADB_OPTIONS" ? Not really InnoDB sys table style, I agree, but guarantees no conflicts in the future. > }; > > /* If this flag is TRUE, then we will load the cluster index's (and tables') > @@ -2365,6 +2386,11 @@ dict_load_table( > btr_pcur_close(&pcur); > mtr_commit(&mtr); > > + if (table && options) { no need to do if (table), because table is guaranteed to be not NULL here > + ut_ad(table->table_options); > + memcpy(table->table_options, options, sizeof(dict_tableoptions_t)); > + } > + > if (table->space == 0) { > /* The system tablespace is always available. */ > } else if (table->flags2 & DICT_TF2_DISCARDED) { > diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc > index 1724ac0..39d0d55 100644 > --- a/storage/innobase/dict/dict0mem.cc > +++ b/storage/innobase/dict/dict0mem.cc > @@ -85,7 +86,6 @@ dict_mem_table_create( > mem_heap_t* heap; > > ut_ad(name); > - ut_a(dict_tf_is_valid(flags)); why? > ut_a(!(flags2 & ~DICT_TF2_BIT_MASK)); > > heap = mem_heap_create(DICT_HEAP_SIZE); > diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc > index 928c72c..4f75465 100644 > --- a/storage/innobase/fil/fil0fil.cc > +++ b/storage/innobase/fil/fil0fil.cc > @@ -716,27 +717,6 @@ fil_node_open_file( > ut_error; > } > > - if (UNIV_UNLIKELY(space->flags != flags)) { > - fprintf(stderr, > - "InnoDB: Error: table flags are 0x%lx" > - " in the data dictionary\n" > - "InnoDB: but the flags in file %s are 0x%lx!\n", > - space->flags, node->name, flags); do you still the check somewhere where SYS_TABLE_OPTIONS is compared with frm? > - > - ut_error; > - } > - > - if (UNIV_UNLIKELY(space->flags != flags)) { > - if (!dict_tf_verify_flags(space->flags, flags)) { > - fprintf(stderr, > - "InnoDB: Error: table flags are 0x%lx" > - " in the data dictionary\n" > - "InnoDB: but the flags in file %s are 0x%lx!\n", > - space->flags, node->name, flags); > - ut_error; > - } > - } > - > if (size_bytes >= FSP_EXTENT_SIZE * UNIV_PAGE_SIZE) { > /* Truncate the size to whole extent size. */ > size_bytes = ut_2pow_round(size_bytes, > @@ -1917,11 +1909,6 @@ fil_check_first_page( > flags = mach_read_from_4(FSP_HEADER_OFFSET + FSP_SPACE_FLAGS + page); > > if (UNIV_PAGE_SIZE != fsp_flags_get_page_size(flags)) { > - fprintf(stderr, > - "InnoDB: Error: Current page size %lu != " > - " page size on page %lu\n", > - UNIV_PAGE_SIZE, fsp_flags_get_page_size(flags)); > - why? > return("innodb-page-size mismatch"); > } > > @@ -3379,8 +3362,7 @@ fil_create_new_single_table_tablespace( > ulint size, /*!< in: the initial size of the > tablespace file in pages, > must be >= FIL_IBD_FILE_INITIAL_SIZE */ > - fil_encryption_t mode, /*!< in: encryption mode */ > - ulint key_id) /*!< in: encryption key_id */ > + const dict_table_t* table) /*!< in: table or NULL */ what does NULL mean here? > { > os_file_t file; > ibool ret; > @@ -3640,6 +3627,140 @@ fil_report_bad_tablespace( > (ulong) expected_id, (ulong) expected_flags); > } > > +/****************************************************************** > +Set flags for a tablespace */ > +static > +void > +fil_space_set_fsp_flags( > +/*=====================*/ > + ulint id, /*!< in: space id */ > + uint flags) /*!< in: fsp flags */ > +{ > + fil_space_t* space; > + > + ut_ad(fil_system); > + > + mutex_enter(&fil_system->mutex); > + > + space = fil_space_get_by_id(id); > + > + if (space != NULL) { > + space->flags = flags; > + } > + > + mutex_exit(&fil_system->mutex); > +} > + > +/****************************************************************** > +Update tablespace (fsp) flags on page 0 a bit more verbose comment would've been be nice. like, say that it's used to migrate from mariadb-flags-in-page-0 to sys_table_options approach. > +@return true if successfull, false if not */ > +static > +void > +fil_update_page0( > +/*=============*/ > + byte* page0, /*!< in: page 0 or NULL */ why do you need this page0 argument if it is *always* NULL? > + os_file_t data_file, /*!< in: data file */ > + ulint space, /*!< in: space id */ > + ulint flags, /*!< in: old fsp flags */ > + ulint fsp_flags)/*!< in: new fsp flags */ > +{ > + ulint psize = FSP_FLAGS_GET_PAGE_SSIZE_MARIADB(flags); > + ulint zip_size = FSP_FLAGS_GET_ZIP_SSIZE(flags); > + > + if (!psize) { > + psize = UNIV_PAGE_SIZE_ORIG; > + } > + > + fsp_flags = fsp_flags_set_page_size(fsp_flags, psize); > + > + if (flags != fsp_flags) { > + > + ib_logf(IB_LOG_LEVEL_INFO, > + "InnoDB: Adjusted space_id %lu tablespace flags from %lu to %lu.\n", > + space, flags, fsp_flags); > + > + mtr_t mtr; > + mtr_start(&mtr); > + > + if (!page0) { > + buf_block_t* block = buf_page_get_gen(space, > + zip_size, 0, > + RW_X_LATCH, > + NULL, > + BUF_GET, > + __FILE__, __LINE__, > + &mtr); > + page0 = buf_block_get_frame(block); > + } > + > + mlog_write_ulint(page0 + FSP_HEADER_OFFSET + FSP_SPACE_FLAGS, > + fsp_flags, MLOG_4BYTES, &mtr); > + /* Redo log this as bytewise update to page 0 > + followed by an MLOG_FILE_WRITE_FSP_FLAGS */ > + byte* log_ptr = mlog_open(&mtr, 11 + 8); > + if (log_ptr != NULL) { > + log_ptr = mlog_write_initial_log_record_fast( > + page0, > + MLOG_FILE_WRITE_FSP_FLAGS, > + log_ptr, &mtr); > + mach_write_to_4(log_ptr, fsp_flags); > + log_ptr += 4; > + mach_write_to_4(log_ptr, space); > + log_ptr += 4; > + mlog_close(&mtr, log_ptr); > + } > + > + mtr_commit(&mtr); > + lsn_t end_lsn = mtr.end_lsn; > + buf_flush_init_for_writing(page0, NULL, end_lsn); > + flags = mach_read_from_4(FSP_HEADER_OFFSET + FSP_SPACE_FLAGS + page0); > + ut_ad(flags == fsp_flags); > + > + /* Flush dirty page to the storage */ > + ulint n_pages = 0; > + ulint sum_pages = 0; > + bool success = false; > + do { > + success = buf_flush_list(ULINT_MAX, end_lsn, &n_pages); > + buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST); > + sum_pages += n_pages; > + } while (!success); > + > + fil_space_set_fsp_flags(space, fsp_flags); > + } > +} > + > +/****************************************************************** > +Parse a MLOG_FILE_WRITE_FSP_FLAGS log entry > +@return position on log buffer */ > +UNIV_INTERN > +byte* > +fil_parse_write_fsp_flags( > +/*======================*/ > + byte* ptr, /*!< in: Log entry start */ > + byte* end_ptr,/*!< in: Log entry end */ > + buf_block_t* block) /*!< in: buffer block */ > +{ > + /* check that redo log entry is complete */ > + uint entry_size = 4 + 4; // size of flags + space_id > + > + if (end_ptr - ptr < entry_size){ > + return NULL; > + } > + > + ulint flags = mach_read_from_4(ptr); > + ptr += 4; > + ulint space_id = mach_read_from_4(ptr); > + ptr += 4; > + > + ut_a(fsp_flags_is_valid(flags)); > + > + /* update fil_space memory cache with flags */ > + fil_space_set_fsp_flags(space_id, flags); > + > + return ptr; > +} > + > /********************************************************************//** > Tries to open a single-table tablespace and optionally checks that the > space id in it is correct. If this does not succeed, print an error message > diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc > index cc4a4f9..f81fd31 100644 > --- a/storage/innobase/fts/fts0fts.cc > +++ b/storage/innobase/fts/fts0fts.cc > @@ -1981,7 +1982,13 @@ fts_create_one_index_table( > dict_mem_table_add_col(new_table, heap, "ilist", DATA_BLOB, > 4130048, 0); > > - error = row_create_table_for_mysql(new_table, trx, false, FIL_SPACE_ENCRYPTION_DEFAULT, FIL_DEFAULT_ENCRYPTION_KEY); > + /* Get default encryption key id if set */ > + if (new_table && new_table->table_options && new_table cannot be NULL here > + new_table->table_options->encryption_key_id == 0) { > + new_table->table_options->encryption_key_id = innobase_get_default_encryption_key_id(trx); do you want to do it here? may be better do it in row_create_table_for_mysql? > + } > + > + error = row_create_table_for_mysql(new_table, trx, false); > > if (error != DB_SUCCESS) { > trx->error_state = error; > diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc > index 527c5be..3d5aaee 100644 > --- a/storage/innobase/handler/ha_innodb.cc > +++ b/storage/innobase/handler/ha_innodb.cc > @@ -5459,6 +5460,43 @@ ha_innobase::innobase_initialize_autoinc() > } > > /*****************************************************************//** > +Set up the table options structure based on frm. */ > +UNIV_INTERN > +void > +ha_innobase::set_table_options( > +/*===========================*/ > + THD* thd, /*!< in: thd */ > + TABLE* table, /*!< in: table */ > + dict_tableoptions_t* options) /*!< in: table options */ > +{ > + ha_table_option_struct* moptions = table->s->option_struct; > + > + options->page_compressed = moptions->page_compressed; > + options->page_compression_level = moptions->page_compression_level; > + options->atomic_writes = (atomic_writes_t)moptions->atomic_writes; > + options->encryption = (fil_encryption_t)moptions->encryption; > + options->encryption_key_id = moptions->encryption_key_id; > + > + if (options->encryption_key_id == 0) { > + options->encryption_key_id = THDVAR(thd, default_encryption_key_id); > + } No, this is not how it works. The *server* sets the encryption_key_id based on the default_encryption_key_id. The engine does not need to bother. > + > + if (options->page_compression_level == 0) { > + options->page_compression_level = page_zip_level; > + } same here > + > + /* Table options should be stored if they are not same as > + defaults */ > + if (moptions->page_compressed || > + (options->atomic_writes == ATOMIC_WRITES_ON || > + options->atomic_writes == ATOMIC_WRITES_OFF) || > + (options->encryption == FIL_SPACE_ENCRYPTION_OFF || > + options->encryption == FIL_SPACE_ENCRYPTION_ON)) { > + options->need_stored = true; > + } > +} > + > +/*****************************************************************//** > Creates and opens a handle to a table which already exists in an InnoDB > database. > @return 1 if error, 0 if success */ > @@ -11603,6 +11647,10 @@ ha_innobase::check_table_options( > return "ENCRYPTION_KEY_ID"; > > } > + > + table_options->need_stored = true; > + > + table_options->need_stored = true; typo > } > > /* Check atomic writes requirements */ > @@ -20422,3 +20483,25 @@ ib_push_warning( > my_free(buf); > va_end(args); > } > + > +/********************************************************************//** > +Helper function to get default_encryption_key_id from THD > +(trx->mysql_thd). > +@return default_encryption_key_id from THD or > +FIL_DEFAULT_ENCRYPTION_KEY */ > +UNIV_INTERN > +ulint > +innobase_get_default_encryption_key_id( See comment above. You _probably_ don't need this method > +/*===================================*/ > + trx_t* trx) /*! in: trx */ > +{ > + ulint key_id = FIL_DEFAULT_ENCRYPTION_KEY; > + > + if (trx && trx->mysql_thd) { > + THD *thd = (THD *)trx->mysql_thd; > + > + key_id = THDVAR(thd, default_encryption_key_id); > + } > + > + return (key_id); > +} > diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc > index ef69e7d..75baa9d 100644 > --- a/storage/innobase/handler/i_s.cc > +++ b/storage/innobase/handler/i_s.cc > @@ -9130,3 +9129,230 @@ UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_semaphore_waits = > STRUCT_FLD(version_info, INNODB_VERSION_STR), > STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA), > }; > + > +/** SYS_TABLE_OPTIONS ************************************************/ > +/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_TABLE_OPTIONS */ > +static ST_FIELD_INFO innodb_sys_tableoptions_fields_info[] = Good idea! > +{ > + // SYS_TABLE_OPTIONS_TABLE_ID 0 > + {STRUCT_FLD(field_name, "TABLE_ID"), > + STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS), > + STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG), > + STRUCT_FLD(value, 0), > + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), > + STRUCT_FLD(old_name, ""), > + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, > + > + // SYS_TABLE_OPTIONS_PAGE_COMPRESSED 1 > + {STRUCT_FLD(field_name, "PAGE_COMPRESSED"), > + STRUCT_FLD(field_length, 7), > + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), > + STRUCT_FLD(value, 0), > + STRUCT_FLD(field_flags, 0), > + STRUCT_FLD(old_name, ""), > + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, > + > + // SYS_TABLE_OPTIONS_PAGE_COMPRESSION_LEVEL 2 > + {STRUCT_FLD(field_name, "PAGE_COMPRESSION_LEVEL"), > + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), > + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), > + STRUCT_FLD(value, 0), > + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), > + STRUCT_FLD(old_name, ""), > + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, > + > + // SYS_TABLE_OPTIONS_ATOMIC_WRITES 3 > + {STRUCT_FLD(field_name, "ATOMIC_WRITES"), > + STRUCT_FLD(field_length, 9), > + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), > + STRUCT_FLD(value, 0), > + STRUCT_FLD(field_flags, 0), > + STRUCT_FLD(old_name, ""), > + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, > + > + // SYS_TABLE_OPTIONS_ENCRYPTED 4 > + {STRUCT_FLD(field_name, "ENCRYPTED"), > + STRUCT_FLD(field_length, 9), > + STRUCT_FLD(field_type, MYSQL_TYPE_STRING), > + STRUCT_FLD(value, 0), > + STRUCT_FLD(field_flags, 0), > + STRUCT_FLD(old_name, ""), > + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, > + > + // SYS_TABLE_OPTIONS_ENCRYPTION_KEY_ID 5 > + {STRUCT_FLD(field_name, "ENCRYPTION_KEY_ID"), > + STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS), > + STRUCT_FLD(field_type, MYSQL_TYPE_LONG), > + STRUCT_FLD(value, 0), > + STRUCT_FLD(field_flags, MY_I_S_UNSIGNED), > + STRUCT_FLD(old_name, ""), > + STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, > + > + END_OF_ST_FIELD_INFO > +}; > + > +/*******************************************************************//** > +Function to go through each record in SYS_TABLE_OPTIONS table, and fill the > +information_schema.innodb_sys_table_options table with related table information > +@return 0 on success */ > +static > +int > +i_s_dict_fill_sys_table_options( > +/*============================*/ > + THD* thd, /*!< in: thread */ > + TABLE_LIST* tables, /*!< in/out: tables to fill */ > + Item* ) /*!< in: condition (not used) */ > +{ > + btr_pcur_t pcur; > + const rec_t* rec; > + mem_heap_t* heap; > + mtr_t mtr; > + > + DBUG_ENTER("i_s_sys_table_options_fill_table"); > + RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); > + > + /* deny access to user without PROCESS_ACL privilege */ > + if (check_global_access(thd, PROCESS_ACL, true)) { > + DBUG_RETURN(0); > + } > + > + heap = mem_heap_create(1000); > + mutex_enter(&(dict_sys->mutex)); > + mtr_start(&mtr); > + > + rec = dict_startscan_system(&pcur, &mtr, SYS_TABLE_OPTIONS); > + > + while (rec) { > + const char* err_msg; > + dict_tableoptions_t options; > + > + /* Create and populate a dict_tableoptions_t structure with > + information from SYS_TABLE_OPTIONS row */ > + memset(&options, 0, sizeof(dict_tableoptions_t)); > + > + err_msg = dict_process_sys_tableoptions( > + heap, rec, &options); > + > + mtr_commit(&mtr); > + mutex_exit(&dict_sys->mutex); > + > + if (!err_msg) { > + Field** fields = tables->table->field; > + > + OK(fields[SYS_TABLE_OPTIONS_TABLE_ID]->store((longlong) options.table_id)); > + OK(fields[SYS_TABLE_OPTIONS_PAGE_COMPRESSION_LEVEL]->store((ulint)options.page_compression_level)); > + OK(fields[SYS_TABLE_OPTIONS_ENCRYPTION_KEY_ID]->store((ulint)options.encryption_key_id)); > + > + if (options.page_compressed) { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_PAGE_COMPRESSED], "YES")); > + } else { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_PAGE_COMPRESSED], "NO")); > + } > + > + if (options.encryption == FIL_SPACE_ENCRYPTION_DEFAULT) { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_ENCRYPTED], "DEFAULT")); > + } else if (options.encryption == FIL_SPACE_ENCRYPTION_ON) { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_ENCRYPTED], "ON")); > + } else { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_ENCRYPTED], "OFF")); > + } > + > + if (options.atomic_writes == ATOMIC_WRITES_DEFAULT) { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_ATOMIC_WRITES], "DEFAULT")); > + } else if (options.atomic_writes == ATOMIC_WRITES_ON) { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_ATOMIC_WRITES], "ON")); > + } else { > + OK(field_store_string(fields[SYS_TABLE_OPTIONS_ATOMIC_WRITES], "OFF")); > + } > + > + OK(schema_table_store_record(thd, tables->table)); > + > + } else { > + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, > + ER_CANT_FIND_SYSTEM_REC, "%s", > + err_msg); > + } > + > + mem_heap_empty(heap); > + > + /* Get the next record */ > + mutex_enter(&dict_sys->mutex); > + mtr_start(&mtr); > + rec = dict_getnext_system(&pcur, &mtr); > + } > + > + mtr_commit(&mtr); > + mutex_exit(&dict_sys->mutex); > + mem_heap_free(heap); > + > + DBUG_RETURN(0); > +} > +/*******************************************************************//** > +Bind the dynamic table INFORMATION_SCHEMA.INNODB_SYS_TABLE_OPTIONS > +@return 0 on success */ > +static > +int > +innodb_sys_table_options_init( > +/*============================*/ > + void* p) /*!< in/out: table schema object */ > +{ > + ST_SCHEMA_TABLE* schema; > + > + DBUG_ENTER("innodb_sys_table_options_init"); > + > + schema = (ST_SCHEMA_TABLE*) p; > + > + schema->fields_info = innodb_sys_tableoptions_fields_info; > + schema->fill_table = i_s_dict_fill_sys_table_options; > + > + DBUG_RETURN(0); > +} > + > +UNIV_INTERN struct st_maria_plugin i_s_innodb_sys_table_options = > +{ > + /* the plugin type (a MYSQL_XXX_PLUGIN value) */ > + /* int */ > + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), > + > + /* pointer to type-specific plugin descriptor */ > + /* void* */ > + STRUCT_FLD(info, &i_s_info), > + > + /* plugin name */ > + /* const char* */ > + STRUCT_FLD(name, "INNODB_SYS_TABLE_OPTIONS"), > + > + /* plugin author (for SHOW PLUGINS) */ > + /* const char* */ > + STRUCT_FLD(author, maria_plugin_author), > + > + /* general descriptive text (for SHOW PLUGINS) */ > + /* const char* */ > + STRUCT_FLD(descr, "InnoDB SYS_TABLE_OPTIONS"), > + > + /* the plugin license (PLUGIN_LICENSE_XXX) */ > + /* int */ > + STRUCT_FLD(license, PLUGIN_LICENSE_GPL), > + > + /* the function to invoke when plugin is loaded */ > + /* int (*)(void*); */ > + STRUCT_FLD(init, innodb_sys_table_options_init), > + > + /* the function to invoke when plugin is unloaded */ > + /* int (*)(void*); */ > + STRUCT_FLD(deinit, i_s_common_deinit), > + > + /* plugin version (for SHOW PLUGINS) */ > + /* unsigned int */ > + STRUCT_FLD(version, INNODB_VERSION_SHORT), > + > + /* struct st_mysql_show_var* */ > + STRUCT_FLD(status_vars, NULL), > + > + /* struct st_mysql_sys_var** */ > + STRUCT_FLD(system_vars, NULL), > + > + /* Maria extension */ > + STRUCT_FLD(version_info, INNODB_VERSION_STR), > + STRUCT_FLD(maturity, MariaDB_PLUGIN_MATURITY_BETA), > +}; > diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h > index b15d364..fa65884 100644 > --- a/storage/innobase/include/dict0dict.h > +++ b/storage/innobase/include/dict0dict.h > @@ -944,15 +948,8 @@ dict_tf_set( > ulint* flags, /*!< in/out: table */ > rec_format_t format, /*!< in: file format */ > ulint zip_ssize, /*!< in: zip shift size */ > - bool remote_path, /*!< in: table uses DATA DIRECTORY > + bool remote_path); /*!< in: table uses DATA DIRECTORY > */ > - bool page_compressed,/*!< in: table uses page compressed > - pages */ > - ulint page_compression_level, /*!< in: table page compression > - level */ > - ulint atomic_writes) /*!< in: table atomic > - writes option value*/ > - __attribute__((nonnull)); Why do you remove nonnull attributes? They help gcc to optimize the code > /********************************************************************//** > Convert a 32 bit integer table flags to the 32 bit integer that is > written into the tablespace header at the offset FSP_SPACE_FLAGS and is > diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic > index a3a3446..3580081 100644 > --- a/storage/innobase/include/dict0dict.ic > +++ b/storage/innobase/include/dict0dict.ic > @@ -685,11 +629,7 @@ dict_sys_tables_type_validate( > ulint zip_ssize = DICT_TF_GET_ZIP_SSIZE(type); > ulint atomic_blobs = DICT_TF_HAS_ATOMIC_BLOBS(type); > ulint unused = DICT_TF_GET_UNUSED(type); > - ulint page_compression = DICT_TF_GET_PAGE_COMPRESSION(type); > - ulint page_compression_level = DICT_TF_GET_PAGE_COMPRESSION_LEVEL(type); By the way, what about page compression in MySQL InnoDB? where is that stored? will you support those tables? > - ulint atomic_writes = DICT_TF_GET_ATOMIC_WRITES(type); > - > - ut_a(atomic_writes <= ATOMIC_WRITES_OFF); > + ulint unused_mariadb = DICT_TF_GET_UNUSED_MARIADB(type); > > /* The low order bit of SYS_TABLES.TYPE is always set to 1. > If the format is UNIV_FORMAT_B or higher, this field is the same > diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h > index 7fe0cc8..bc7f317 100644 > --- a/storage/innobase/include/fil0fil.h > +++ b/storage/innobase/include/fil0fil.h > @@ -39,7 +39,7 @@ Created 10/25/1995 Heikki Tuuri > #include "ibuf0types.h" > #include "log0log.h" > #endif /* !UNIV_HOTBACKUP */ > - > +#include "my_crypt.h" why? > #include <list> > > // Forward declaration > diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc > index d7b37b5..29ce93d 100644 > --- a/storage/innobase/srv/srv0start.cc > +++ b/storage/innobase/srv/srv0start.cc > @@ -2537,7 +2543,16 @@ innobase_start_or_create_for_mysql(void) > > sys_datafiles_created = true; > > - /* This function assumes that SYS_DATAFILES exists */ > + err = dict_create_or_check_sys_table_options(); > + > + if (err != DB_SUCCESS) { > + return(err); > + } > + > + sys_table_options_created = true; > + > + /* This function assumes that SYS_DATAFILES > + and SYS_TABLE_OPTIONS exists */ "exist" > dict_check_tablespaces_and_store_max_id(dict_check); > } Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

2 3

[Maria-developers] GSoC 2016 Community Bonding
by Charles Dirk 02 May '16

02 May '16

Hi everyone, I am Charles Dirk, also Razor on IRC and am glad to be selected as a Google summer of Code student with MariaDB. I will be working on Providing GTID support in MHA and I will be mentored by Byte. I look forward to contributing to and learning much from the MariaDB developer community this summer. I am currently reading some documentation on KB to get more pointers on this task while waiting to hear from my Mentor. Cheers, Charles.

2 1

[Maria-developers] [GSOC Students] Allow to contribute
by Даниил Медведев 02 May '16

02 May '16

Hello everyone! I was selected for GSoC to work with MariaDB, with task NO PAD Collatons. Me profile on github is medvdanil, and i'm planning to code in my own branch 10.2-MDEV-9711 or 10.1-MDEV-9711. Which version I should select 10.1 or 10.2? And I ask to give me access to create one of those branches and commit to it. Regards, Daniil Medvedev

4 4