- commits - lists.mariadb.org

[Commits] 6c5e60f: MDEV-16038 Assertion `map->n_bits > 0' failed (my_bitmap.c:386: bitmap_is_clear_all)
by IgorBabaev 26 Apr '18

26 Apr '18

revision-id: 6c5e60f1b198ff846ee5595927ff5a74c6b08e91 (mariadb-10.3.6-67-g6c5e60f) parent(s): 99fa7c6c2f9c8d705481bec35f7c4af48848cf70 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-26 16:38:56 -0700 message: MDEV-16038 Assertion `map->n_bits > 0' failed (my_bitmap.c:386: bitmap_is_clear_all) Rows with no elements are not allowed in a table value constructor unless it is used in an INSERT statement. --- mysql-test/main/table_value_constr.result | 7 ++++++- mysql-test/main/table_value_constr.test | 9 ++++++++- sql/share/errmsg-utf8.txt | 2 ++ sql/sql_tvc.cc | 6 ++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/table_value_constr.result b/mysql-test/main/table_value_constr.result index 5a904cb..9e0a096 100644 --- a/mysql-test/main/table_value_constr.result +++ b/mysql-test/main/table_value_constr.result @@ -2072,7 +2072,7 @@ select * from (values (1), (t1.b), (2)) as new_tvc; ERROR HY000: Field reference 't1.b' can't be used in table value constructor drop table t1; # -# MDEV-MDEV-15940: cursor over TVC +# MDEV-15940: cursor over TVC # BEGIN NOT ATOMIC DECLARE v INT; @@ -2092,3 +2092,8 @@ END; | v 1 +# +# MDEV-16038: empty row in TVC +# +with t as (values (),()) select 1 from t; +ERROR HY000: Row with no elements is not allowed in table value constructor in this context diff --git a/mysql-test/main/table_value_constr.test b/mysql-test/main/table_value_constr.test index 84f196b..eb5ea59 100644 --- a/mysql-test/main/table_value_constr.test +++ b/mysql-test/main/table_value_constr.test @@ -1046,7 +1046,7 @@ select * from (values (1), (t1.b), (2)) as new_tvc; drop table t1; --echo # ---echo # MDEV-MDEV-15940: cursor over TVC +--echo # MDEV-15940: cursor over TVC --echo # DELIMITER |; @@ -1068,3 +1068,10 @@ END; | DELIMITER ;| + +--echo # +--echo # MDEV-16038: empty row in TVC +--echo # + +--error ER_EMPTY_ROW_IN_TVC +with t as (values (),()) select 1 from t; diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 20e4221..c55ac4f 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7913,3 +7913,5 @@ ER_INDEX_FILE_FULL eng "The index file for table '%-.192s' is full" ER_UPDATED_COLUMN_ONLY_ONCE eng "The column %`s.%`s cannot be changed more than once in a single UPDATE statement" +ER_EMPTY_ROW_IN_TVC + eng "Row with no elements is not allowed in table value constructor in this context" diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index 7004c32..295aade 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -221,6 +221,12 @@ bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl, uint cnt= first_elem->elements; Type_holder *holders; + if (cnt == 0) + { + my_error(ER_EMPTY_ROW_IN_TVC, MYF(0)); + DBUG_RETURN(true); + } + if (fix_fields_for_tvc(thd, li)) DBUG_RETURN(true);

1 0

[Commits] 6e42d19: MDEV-15915 Add Feature_json status variable.
by holyfoot＠askmonty.org 26 Apr '18

26 Apr '18

revision-id: 6e42d19f2599b12ac3ff5a82fdcd59e2c261f98c (mariadb-10.3.6-55-g6e42d19) parent(s): cd48c1e23a0ca203d87786ae9b0f53aff4c1b433 committer: Alexey Botchkov timestamp: 2018-04-26 23:12:51 +0400 message: MDEV-15915 Add Feature_json status variable. Related implementations. --- mysql-test/main/features.result | 1 + mysql-test/main/status.result | 12 ++++++++++++ mysql-test/main/status.test | 7 +++++++ sql/item_create.cc | 26 ++++++++++++++++++++++++++ sql/mysqld.cc | 1 + sql/sql_class.h | 1 + 6 files changed, 48 insertions(+) diff --git a/mysql-test/main/features.result b/mysql-test/main/features.result index a12b41c..8a4a200 100644 --- a/mysql-test/main/features.result +++ b/mysql-test/main/features.result @@ -10,6 +10,7 @@ Feature_dynamic_columns 0 Feature_fulltext 0 Feature_gis 0 Feature_invisible_columns 0 +Feature_json 0 Feature_locale 0 Feature_subquery 0 Feature_timezone 0 diff --git a/mysql-test/main/status.result b/mysql-test/main/status.result index 18cde57..688d8ac 100644 --- a/mysql-test/main/status.result +++ b/mysql-test/main/status.result @@ -426,6 +426,18 @@ Threads_running 1 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='THREADS_RUNNING'; VARIABLE_VALUE 1 +# +# MDEV-15915 Add Feature_json status variable. +# +SHOW STATUS LIKE 'Feature_json'; +Variable_name Value +Feature_json 0 +select json_valid('123'); +json_valid('123') +1 +SHOW STATUS LIKE 'Feature_json'; +Variable_name Value +Feature_json 1 connection default; set @@global.concurrent_insert= @old_concurrent_insert; SET GLOBAL log_output = @old_log_output; diff --git a/mysql-test/main/status.test b/mysql-test/main/status.test index 92fba9a..221a24a 100644 --- a/mysql-test/main/status.test +++ b/mysql-test/main/status.test @@ -430,6 +430,13 @@ FLUSH STATUS; SHOW STATUS LIKE 'Threads_running'; SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='THREADS_RUNNING'; +--echo # +--echo # MDEV-15915 Add Feature_json status variable. +--echo # +SHOW STATUS LIKE 'Feature_json'; +select json_valid('123'); +SHOW STATUS LIKE 'Feature_json'; + # Restore global concurrent_insert value. Keep in the end of the test file. --connection default set @@global.concurrent_insert= @old_concurrent_insert; diff --git a/sql/item_create.cc b/sql/item_create.cc index 901dfa0..8b8476b 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -5118,6 +5118,7 @@ Create_func_json_exists Create_func_json_exists::s_singleton; Item* Create_func_json_exists::create_2_arg(THD *thd, Item *arg1, Item *arg2) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_exists(thd, arg1, arg2); } @@ -5143,6 +5144,7 @@ Create_func_json_detailed::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_format(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5152,6 +5154,7 @@ Create_func_json_loose Create_func_json_loose::s_singleton; Item* Create_func_json_loose::create_1_arg(THD *thd, Item *arg1) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_format(thd, arg1, Item_func_json_format::LOOSE); } @@ -5162,6 +5165,7 @@ Create_func_json_compact Create_func_json_compact::s_singleton; Item* Create_func_json_compact::create_1_arg(THD *thd, Item *arg1) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_format(thd, arg1, Item_func_json_format::COMPACT); } @@ -5172,6 +5176,7 @@ Create_func_json_valid Create_func_json_valid::s_singleton; Item* Create_func_json_valid::create_1_arg(THD *thd, Item *arg1) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_valid(thd, arg1); } @@ -5181,6 +5186,7 @@ Create_func_json_type Create_func_json_type::s_singleton; Item* Create_func_json_type::create_1_arg(THD *thd, Item *arg1) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_type(thd, arg1); } @@ -5190,6 +5196,7 @@ Create_func_json_depth Create_func_json_depth::s_singleton; Item* Create_func_json_depth::create_1_arg(THD *thd, Item *arg1) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_depth(thd, arg1); } @@ -5199,6 +5206,7 @@ Create_func_json_value Create_func_json_value::s_singleton; Item* Create_func_json_value::create_2_arg(THD *thd, Item *arg1, Item *arg2) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_value(thd, arg1, arg2); } @@ -5208,6 +5216,7 @@ Create_func_json_query Create_func_json_query::s_singleton; Item* Create_func_json_query::create_2_arg(THD *thd, Item *arg1, Item *arg2) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_query(thd, arg1, arg2); } @@ -5217,6 +5226,7 @@ Create_func_json_quote Create_func_json_quote::s_singleton; Item* Create_func_json_quote::create_1_arg(THD *thd, Item *arg1) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_quote(thd, arg1); } @@ -5226,6 +5236,7 @@ Create_func_json_unquote Create_func_json_unquote::s_singleton; Item* Create_func_json_unquote::create_1_arg(THD *thd, Item *arg1) { + status_var_increment(current_thd->status_var.feature_json); return new (thd->mem_root) Item_func_json_unquote(thd, arg1); } @@ -5256,6 +5267,7 @@ Create_func_json_array::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_array(thd); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5281,6 +5293,7 @@ Create_func_json_array_append::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_array_append(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5306,6 +5319,7 @@ Create_func_json_array_insert::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_array_insert(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5332,6 +5346,7 @@ Create_func_json_insert::create_native(THD *thd, LEX_CSTRING *name, thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5358,6 +5373,7 @@ Create_func_json_set::create_native(THD *thd, LEX_CSTRING *name, thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5384,6 +5400,7 @@ Create_func_json_replace::create_native(THD *thd, LEX_CSTRING *name, thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5409,6 +5426,7 @@ Create_func_json_remove::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_remove(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5441,6 +5459,7 @@ Create_func_json_object::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_object(thd); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5465,6 +5484,7 @@ Create_func_json_length::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_length(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5489,6 +5509,7 @@ Create_func_json_merge::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_merge(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5514,6 +5535,7 @@ Create_func_json_contains::create_native(THD *thd, LEX_CSTRING *name, my_error(ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT, MYF(0), name->str); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5539,6 +5561,7 @@ Create_func_json_keys::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_keys(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5564,6 +5587,7 @@ Create_func_json_contains_path::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_contains_path(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5589,6 +5613,7 @@ Create_func_json_extract::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_extract(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } @@ -5614,6 +5639,7 @@ Create_func_json_search::create_native(THD *thd, LEX_CSTRING *name, func= new (thd->mem_root) Item_func_json_search(thd, *item_list); } + status_var_increment(current_thd->status_var.feature_json); return func; } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2b1b09c..286a73d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8553,6 +8553,7 @@ SHOW_VAR status_vars[]= { {"Feature_fulltext", (char*) offsetof(STATUS_VAR, feature_fulltext), SHOW_LONG_STATUS}, {"Feature_gis", (char*) offsetof(STATUS_VAR, feature_gis), SHOW_LONG_STATUS}, {"Feature_invisible_columns", (char*) offsetof(STATUS_VAR, feature_invisible_columns), SHOW_LONG_STATUS}, + {"Feature_json", (char*) offsetof(STATUS_VAR, feature_json), SHOW_LONG_STATUS}, {"Feature_locale", (char*) offsetof(STATUS_VAR, feature_locale), SHOW_LONG_STATUS}, {"Feature_subquery", (char*) offsetof(STATUS_VAR, feature_subquery), SHOW_LONG_STATUS}, {"Feature_timezone", (char*) offsetof(STATUS_VAR, feature_timezone), SHOW_LONG_STATUS}, diff --git a/sql/sql_class.h b/sql/sql_class.h index 81cf592..75e3f99 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -820,6 +820,7 @@ typedef struct system_status_var ulong feature_fulltext; /* +1 when MATCH is used */ ulong feature_gis; /* +1 opening a table with GIS features */ ulong feature_invisible_columns; /* +1 opening a table with invisible column */ + ulong feature_json; /* +1 when JSON function appears in the statement */ ulong feature_locale; /* +1 when LOCALE is set */ ulong feature_subquery; /* +1 when subqueries are used */ ulong feature_timezone; /* +1 when XPATH is used */

1 0

[Commits] 35e9c9319b8: MDEV-13024: Server crashes in my_store_ptr upon DELETE from sequence in multi-table format
by Oleksandr Byelkin 26 Apr '18

26 Apr '18

revision-id: 35e9c9319b8cbb9aec1d452caa46a17c887312c8 (mariadb-10.3.6-53-g35e9c9319b8) parent(s): 0bdc15d86ea94df6ed7ac07e69309d7b9b7281b2 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-04-26 19:58:43 +0200 message: MDEV-13024: Server crashes in my_store_ptr upon DELETE from sequence in multi-table format Make operation possition() dummy for sequences (should not be used really) --- mysql-test/suite/sql_sequence/other.result | 9 +++++++++ mysql-test/suite/sql_sequence/other.test | 13 +++++++++++++ sql/ha_sequence.h | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/sql_sequence/other.result b/mysql-test/suite/sql_sequence/other.result index e3ec94cf2c5..500fca9a065 100644 --- a/mysql-test/suite/sql_sequence/other.result +++ b/mysql-test/suite/sql_sequence/other.result @@ -184,3 +184,12 @@ ERROR HY000: Function or expression 'setval()' cannot be used in the CHECK claus CREATE TABLE t1 (a int, b int as (next value for s1 > 0)); ERROR HY000: Function or expression 'nextval()' cannot be used in the GENERATED ALWAYS AS clause of `b` drop sequence s1; +# +# MDEV-13024: Server crashes in my_store_ptr upon DELETE from +# sequence in multi-table format +# +CREATE SEQUENCE s; +DELETE s FROM s; +ERROR HY000: Storage engine SEQUENCE of the table `test`.`s` doesn't have this option +DROP SEQUENCE s; +# End of 10.3 tests diff --git a/mysql-test/suite/sql_sequence/other.test b/mysql-test/suite/sql_sequence/other.test index ff0db9e158d..8f35afd73de 100644 --- a/mysql-test/suite/sql_sequence/other.test +++ b/mysql-test/suite/sql_sequence/other.test @@ -157,3 +157,16 @@ CREATE table t1 (a int check (setval(s1,10))); --error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED CREATE TABLE t1 (a int, b int as (next value for s1 > 0)); drop sequence s1; + + +--echo # +--echo # MDEV-13024: Server crashes in my_store_ptr upon DELETE from +--echo # sequence in multi-table format +--echo # +CREATE SEQUENCE s; +--error ER_ILLEGAL_HA +DELETE s FROM s; +DROP SEQUENCE s; + + +--echo # End of 10.3 tests diff --git a/sql/ha_sequence.h b/sql/ha_sequence.h index fd9da05b591..b3789914e18 100644 --- a/sql/ha_sequence.h +++ b/sql/ha_sequence.h @@ -123,7 +123,7 @@ class ha_sequence :public handler return error; } void position(const uchar *record) - { return file->position(record); } + { } const char *table_type() const { return file->table_type(); } ulong index_flags(uint inx, uint part, bool all_parts) const

1 0

Re: [Commits] 326db1a: Mdev-14853 Grant does not work correctly when table contains...
by Sachin Setiya 26 Apr '18

26 Apr '18

Hi Vicentiu, Now, I have run test with embedded mysql server and it passes. May be embedded server does not support advance feature of grant like roles , I dont know. Thanks sachin On Thu, Apr 26, 2018 at 5:39 PM, Vicențiu Ciorbaru <cvicentiu(a)gmail.com> wrote: > Hi Sachin! > > Did you run this test on embedded server? Usually grant related tests > require some form of not_embedded.inc include. (check roles suite for > examples) > > Vicentiu > > On Thu, 26 Apr 2018 at 00:20 sachin <sachin.setiya(a)mariadb.com> wrote: > >> revision-id: 326db1a2aaa9b275a1a21a863e8cd2d9fa1b1d5f >> (mariadb-10.3.6-46-g326db1a) >> parent(s): 9477a2a9ba17c0db362e2bb39d5048e369096f39 >> author: Sachin Setiya >> committer: Sachin Setiya >> timestamp: 2018-04-26 12:47:25 +0530 >> message: >> >> Mdev-14853 Grant does not work correctly when table contains... >> SYSTEM_INVISIBLE or COMPLETELY_INVISIBLE >> >> This commit does multiple things to solve this mdev >> 1st add field into the parameter of check_column_grant_in_table_ref, so >> that >> we can find out field invisibility. >> 2nd If field->invisible >= INVISIBLE_SYSTEM skip access check and simple >> grant access. >> >> --- >> mysql-test/main/invisible_field_grant.result | 111 >> +++++++++++++++++++++++++++ >> mysql-test/main/invisible_field_grant.test | 77 +++++++++++++++++++ >> sql/sp_rcontext.cc | 9 ++- >> sql/sql_acl.cc | 11 ++- >> sql/sql_acl.h | 2 +- >> sql/sql_base.cc | 4 +- >> 6 files changed, 206 insertions(+), 8 deletions(-) >> >> diff --git a/mysql-test/main/invisible_field_grant.result >> b/mysql-test/main/invisible_field_grant.result >> new file mode 100644 >> index 0000000..c3ccbb1 >> --- /dev/null >> +++ b/mysql-test/main/invisible_field_grant.result >> @@ -0,0 +1,111 @@ >> +set @old_debug= @@debug_dbug; >> +create user user_1; >> +show grants for user_1; >> +Grants for user_1@% >> +GRANT USAGE ON *.* TO 'user_1'@'%' >> +# create user >> +create database d; >> +use d; >> + >> +#System_Invisible >> +set debug_dbug= "+d,test_pseudo_invisible"; >> +create table t1(a int); >> +set debug_dbug=@old_debug; >> +insert into t1 values(1); >> +select a,invisible from t1; >> +a invisible >> +1 9 >> +grant insert(a) on t1 to user_1; >> +grant update(a) on t1 to user_1; >> +grant select(a) on t1 to user_1; >> +grant delete on t1 to user_1; >> +connect con1, localhost, user_1,,test; >> +connection con1; >> +select user(); >> +user() >> +user_1@localhost >> +use d; >> +select * from t1; >> +a >> +1 >> +insert into t1 values(2); >> +select * from t1; >> +a >> +1 >> +2 >> +insert into t1(a) values(3); >> +select * from t1; >> +a >> +1 >> +2 >> +3 >> +select invisible,a from t1; >> +invisible a >> +9 1 >> +9 2 >> +9 3 >> +delete from t1 where a =1; >> +update t1 set a=1 where a=3; >> +select * from t1; >> +a >> +2 >> +1 >> +disconnect con1; >> + >> +#Cleanup >> +connection default; >> +drop table t1; >> +REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1; >> + >> +#Completely Invisible >> +set debug_dbug= "+d,test_completely_invisible"; >> +create table t1(a int); >> +insert into t1 values(1); >> +select a,invisible from t1; >> +a invisible >> +1 9 >> +set debug_dbug=@old_debug; >> +grant insert(a) on t1 to user_1; >> +grant update(a) on t1 to user_1; >> +grant select(a) on t1 to user_1; >> +grant delete on t1 to user_1; >> +connect con1, localhost, user_1,,test; >> +connection con1; >> +select user(); >> +user() >> +user_1@localhost >> +use d; >> +select * from t1; >> +a >> +1 >> +insert into t1 values(2); >> +select * from t1; >> +a >> +1 >> +2 >> +insert into t1(a) values(3); >> +select * from t1; >> +a >> +1 >> +2 >> +3 >> +select invisible,a from t1; >> +ERROR 42S22: Unknown column 'invisible' in 'field list' >> +delete from t1 where a =1; >> +update t1 set a=1 where a=3; >> +select * from t1; >> +a >> +2 >> +1 >> +disconnect con1; >> + >> +#Final Cleanup >> +connection default; >> +set debug_dbug= "+d,test_completely_invisible"; >> +select a,invisible from t1; >> +a invisible >> +2 9 >> +1 9 >> +drop user user_1; >> +drop database d; >> +set @old_debug= @@debug_dbug; >> diff --git a/mysql-test/main/invisible_field_grant.test >> b/mysql-test/main/invisible_field_grant.test >> new file mode 100644 >> index 0000000..0d627e5 >> --- /dev/null >> +++ b/mysql-test/main/invisible_field_grant.test >> @@ -0,0 +1,77 @@ >> +--source include/have_debug.inc >> +##TEST for invisible coloumn level 2 >> +set @old_debug= @@debug_dbug; >> +create user user_1; >> +show grants for user_1; >> +--echo # create user >> +create database d; >> +use d; >> + >> +--echo >> +--echo #System_Invisible >> +set debug_dbug= "+d,test_pseudo_invisible"; >> +create table t1(a int); >> +set debug_dbug=@old_debug; >> +insert into t1 values(1); >> +select a,invisible from t1; >> +grant insert(a) on t1 to user_1; >> +grant update(a) on t1 to user_1; >> +grant select(a) on t1 to user_1; >> +grant delete on t1 to user_1; >> +connect (con1, localhost, user_1,,test); >> +connection con1; >> +select user(); >> +use d; >> +select * from t1; >> +insert into t1 values(2); >> +select * from t1; >> +insert into t1(a) values(3); >> +select * from t1; >> +select invisible,a from t1; >> +delete from t1 where a =1; >> +update t1 set a=1 where a=3; >> +select * from t1; >> +disconnect con1; >> +--source include/wait_until_disconnected.inc >> + >> +--echo >> +--echo #Cleanup >> +--connection default >> +drop table t1; >> +REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1; >> + >> +--echo >> +--echo #Completely Invisible >> +set debug_dbug= "+d,test_completely_invisible"; >> +create table t1(a int); >> +insert into t1 values(1); >> +select a,invisible from t1; >> +set debug_dbug=@old_debug; >> +grant insert(a) on t1 to user_1; >> +grant update(a) on t1 to user_1; >> +grant select(a) on t1 to user_1; >> +grant delete on t1 to user_1; >> +connect (con1, localhost, user_1,,test); >> +connection con1; >> +select user(); >> +use d; >> +select * from t1; >> +insert into t1 values(2); >> +select * from t1; >> +insert into t1(a) values(3); >> +select * from t1; >> +--error ER_BAD_FIELD_ERROR >> +select invisible,a from t1; >> +delete from t1 where a =1; >> +update t1 set a=1 where a=3; >> +select * from t1; >> +disconnect con1; >> +--source include/wait_until_disconnected.inc >> +--echo >> +--echo #Final Cleanup >> +connection default; >> +set debug_dbug= "+d,test_completely_invisible"; >> +select a,invisible from t1; >> +drop user user_1; >> +drop database d; >> +set @old_debug= @@debug_dbug; >> diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc >> index 2e9ae23..dc103fa 100644 >> --- a/sql/sp_rcontext.cc >> +++ b/sql/sp_rcontext.cc >> @@ -196,11 +196,12 @@ bool sp_rcontext::init_var_table(THD *thd, >> */ >> static inline bool >> check_column_grant_for_type_ref(THD *thd, TABLE_LIST *table_list, >> - const char *str, size_t length) >> + const char *str, size_t length, >> + Field *fld) >> { >> #ifndef NO_EMBEDDED_ACCESS_CHECKS >> table_list->table->grant.want_privilege= SELECT_ACL; >> - return check_column_grant_in_table_ref(thd, table_list, str, length); >> + return check_column_grant_in_table_ref(thd, table_list, str, length, >> fld); >> #else >> return false; >> #endif >> @@ -238,7 +239,7 @@ bool Qualified_column_ident::resolve_type_ref(THD >> *thd, Column_definition *def) >> { >> if (!(rc= check_column_grant_for_type_ref(thd, table_list, >> m_column.str, >> - m_column.length))) >> + m_column.length, src))) >> { >> *def= Column_definition(thd, src, NULL/*No defaults,no >> constraints*/); >> def->flags&= (uint) ~NOT_NULL_FLAG; >> @@ -302,7 +303,7 @@ bool Table_ident::resolve_table_rowtype_ref(THD *thd, >> LEX_CSTRING tmp= src[0]->field_name; >> Spvar_definition *def; >> if ((rc= check_column_grant_for_type_ref(thd, table_list, >> - tmp.str, tmp.length)) || >> + tmp.str, >> tmp.length,src[0])) || >> (rc= !(src[0]->field_name.str= thd->strmake(tmp.str, >> tmp.length))) || >> (rc= !(def= new (thd->mem_root) Spvar_definition(thd, *src)))) >> break; >> diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc >> index de4e201..1c154a1 100644 >> --- a/sql/sql_acl.cc >> +++ b/sql/sql_acl.cc >> @@ -7775,6 +7775,8 @@ bool check_grant_column(THD *thd, GRANT_INFO *grant, >> table_ref table reference where to check the field >> name name of field to check >> length length of name >> + fld use fld object to check invisibility when it is >> + not 0, not_found_field, view_ref_found >> >> DESCRIPTION >> Check the access rights to a column depending on the type of table >> @@ -7789,13 +7791,17 @@ bool check_grant_column(THD *thd, GRANT_INFO >> *grant, >> */ >> >> bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref, >> - const char *name, size_t length) >> + const char *name, size_t length, >> + Field *fld) >> { >> GRANT_INFO *grant; >> const char *db_name; >> const char *table_name; >> Security_context *sctx= table_ref->security_ctx ? >> table_ref->security_ctx : thd->security_ctx; >> + if (fld && fld != not_found_field && fld != view_ref_found >> + && fld->invisible >= INVISIBLE_SYSTEM) >> + return false; >> >> if (table_ref->view || table_ref->field_translation) >> { >> @@ -7871,6 +7877,9 @@ bool check_grant_all_columns(THD *thd, ulong >> want_access_arg, >> >> for (; !fields->end_of_fields(); fields->next()) >> { >> + if (fields->field() && >> + fields->field()->invisible >= INVISIBLE_SYSTEM) >> + continue; >> LEX_CSTRING *field_name= fields->name(); >> >> if (table_name != fields->get_table_name()) >> diff --git a/sql/sql_acl.h b/sql/sql_acl.h >> index a608ef0..6da7d4d 100644 >> --- a/sql/sql_acl.h >> +++ b/sql/sql_acl.h >> @@ -239,7 +239,7 @@ bool check_grant_column (THD *thd, GRANT_INFO *grant, >> const char *db_name, const char *table_name, >> const char *name, size_t length, >> Security_context *sctx); >> bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref, >> - const char *name, size_t length); >> + const char *name, size_t length, >> Field *fld); >> bool check_grant_all_columns(THD *thd, ulong want_access, >> Field_iterator_table_ref *fields); >> bool check_grant_routine(THD *thd, ulong want_access, >> diff --git a/sql/sql_base.cc b/sql/sql_base.cc >> index 0081365..383341c 100644 >> --- a/sql/sql_base.cc >> +++ b/sql/sql_base.cc >> @@ -5880,7 +5880,7 @@ find_field_in_table_ref(THD *thd, TABLE_LIST >> *table_list, >> #ifndef NO_EMBEDDED_ACCESS_CHECKS >> /* Check if there are sufficient access rights to the found field. */ >> if (check_privileges && >> - check_column_grant_in_table_ref(thd, *actual_table, name, >> length)) >> + check_column_grant_in_table_ref(thd, *actual_table, name, >> length, fld)) >> fld= WRONG_GRANT; >> else >> #endif >> @@ -6057,7 +6057,7 @@ find_field_in_tables(THD *thd, Item_ident *item, >> #ifndef NO_EMBEDDED_ACCESS_CHECKS >> /* Check if there are sufficient access rights to the found field. >> */ >> if (found && check_privileges && >> - check_column_grant_in_table_ref(thd, table_ref, name, length)) >> + check_column_grant_in_table_ref(thd, table_ref, name, length, >> found)) >> found= WRONG_GRANT; >> #endif >> } >> _______________________________________________ >> commits mailing list >> commits(a)mariadb.org >> https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits > > -- Regards Sachin Setiya Software Engineer at MariaDB

1 0

[Commits] bea915f: MDEV-15965 Invisible columns and LOAD DATA don't work well together:...
by sachin 26 Apr '18

26 Apr '18

revision-id: bea915f21a2a2771ce7f9e19dcb9d6893f33f7bd (mariadb-10.3.6-47-gbea915f) parent(s): 326db1a2aaa9b275a1a21a863e8cd2d9fa1b1d5f author: Sachin Setiya committer: Sachin Setiya timestamp: 2018-04-26 16:49:27 +0530 message: MDEV-15965 Invisible columns and LOAD DATA don't work well together:... ER_WARN_TOO_FEW_RECORDS Fix mysql_load iterator to skip invisible fields. --- mysql-test/main/invisible_field.result | 61 ++++++++++++++++++++++++++++++++++ mysql-test/main/invisible_field.test | 25 ++++++++++++++ sql/sql_load.cc | 2 ++ 3 files changed, 88 insertions(+) diff --git a/mysql-test/main/invisible_field.result b/mysql-test/main/invisible_field.result index 5cea77f..876a808 100644 --- a/mysql-test/main/invisible_field.result +++ b/mysql-test/main/invisible_field.result @@ -556,3 +556,64 @@ INSERT INTO t1 (c,t) VALUES ('foo','2000-01-01 00:00:00'); CREATE TRIGGER tr BEFORE INSERT ON t1 FOR EACH ROW SET @a= 1; INSERT INTO t1 SELECT * FROM t1; DROP TABLE t1; +create or replace table t1 (a int, b int invisible); +insert into t1 values (1),(2); +select * from t1 into outfile 'f'; +load data infile 'f' into table t1; +select a,b from t1; +a b +1 NULL +2 NULL +1 NULL +2 NULL +load data infile 'f' into table t1 (a,@v) SET b=@v; +select a,b from t1; +a b +1 NULL +2 NULL +1 NULL +2 NULL +1 NULL +2 NULL +load data infile 'f' into table t1 (a,@v) SET b=a; +select a,b from t1; +a b +1 NULL +2 NULL +1 NULL +2 NULL +1 NULL +2 NULL +1 1 +2 2 +truncate table t1; +insert into t1(a,b) values (1,1),(2,2); +select a,b from t1 into outfile 'a'; +load data infile 'a' into table t1(a,b); +select a,b from t1; +a b +1 1 +2 2 +1 1 +2 2 +load data infile 'a' into table t1 (a,@v) SET b=@v; +select a,b from t1; +a b +1 1 +2 2 +1 1 +2 2 +1 1 +2 2 +load data infile 'a' into table t1 (a,@v) SET b=@v+2; +select a,b from t1; +a b +1 1 +2 2 +1 1 +2 2 +1 1 +2 2 +1 3 +2 4 +drop table t1; diff --git a/mysql-test/main/invisible_field.test b/mysql-test/main/invisible_field.test index cfe89d7..0e3994a 100644 --- a/mysql-test/main/invisible_field.test +++ b/mysql-test/main/invisible_field.test @@ -246,3 +246,28 @@ CREATE TRIGGER tr BEFORE INSERT ON t1 FOR EACH ROW SET @a= 1; INSERT INTO t1 SELECT * FROM t1; # Cleanup DROP TABLE t1; +##LOAD DATA MDEV-15965 Invisible columns and LOAD DATA don't work well +## together: ER_WARN_TOO_FEW_RECORDS +create or replace table t1 (a int, b int invisible); +insert into t1 values (1),(2); + +select * from t1 into outfile 'f'; +load data infile 'f' into table t1; +select a,b from t1; +load data infile 'f' into table t1 (a,@v) SET b=@v; +select a,b from t1; +load data infile 'f' into table t1 (a,@v) SET b=a; +select a,b from t1; +truncate table t1; + +insert into t1(a,b) values (1,1),(2,2); +select a,b from t1 into outfile 'a'; +load data infile 'a' into table t1(a,b); +select a,b from t1; +load data infile 'a' into table t1 (a,@v) SET b=@v; +select a,b from t1; +load data infile 'a' into table t1 (a,@v) SET b=@v+2; +select a,b from t1; + +#cleanup +drop table t1; diff --git a/sql/sql_load.cc b/sql/sql_load.cc index cfa92f1..fbb3926 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -444,6 +444,8 @@ int mysql_load(THD *thd, const sql_exchange *ex, TABLE_LIST *table_list, field_iterator.set(table_list); for (; !field_iterator.end_of_fields(); field_iterator.next()) { + if (field_iterator.field()->invisible > VISIBLE) + continue; Item *item; if (!(item= field_iterator.create_item(thd))) DBUG_RETURN(TRUE);

1 0

[Commits] dc0613edc41: MDEV-15809: Test failure on galera.MW-44
by jan 26 Apr '18

26 Apr '18

revision-id: dc0613edc41590a03a75b5b75e7200c11435ad1a (mariadb-10.1.32-69-gdc0613edc41) parent(s): 779343235b0c33d6d661387456859d623d7f8781 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-26 12:23:19 +0300 message: MDEV-15809: Test failure on galera.MW-44 Disable general log while truncating mysql.general_log to avoid queries to be inserted there. --- mysql-test/suite/galera/disabled.def | 2 +- mysql-test/suite/galera/r/MW-44.result | 14 ++++++++++---- mysql-test/suite/galera/t/MW-44.test | 9 +++++++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 4d83e2ba2ce..4c0a5c7fd9f 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -30,4 +30,4 @@ galera.MW-328A : have_deadlocks test not stable galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry_autocommit galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on query_cache : MDEV-15805 Test failure on galera.query_cache -galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 + diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result index 03de2205772..459a61030a4 100644 --- a/mysql-test/suite/galera/r/MW-44.result +++ b/mysql-test/suite/galera/r/MW-44.result @@ -1,12 +1,18 @@ -SET @@global.wsrep_replicate_myisam=OFF; +SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; SELECT COUNT(*) from mysql.general_log; COUNT(*) -1 +0 +SELECT * FROM mysql.general_log; +event_time user_host thread_id server_id command_type argument +SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; SELECT COUNT(*) from mysql.general_log; COUNT(*) -1 +0 +SELECT * FROM mysql.general_log; +event_time user_host thread_id server_id command_type argument +SET GLOBAL general_log='ON'; SELECT COUNT(*) from mysql.general_log; COUNT(*) 1 @@ -18,8 +24,8 @@ SET SESSION wsrep_osu_method=TOI; SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; COUNT(*) = 2 1 +SET GLOBAL general_log='ON'; SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%'; COUNT(*) = 0 1 DROP TABLE t1; -SET @@global.wsrep_replicate_myisam=Default; diff --git a/mysql-test/suite/galera/t/MW-44.test b/mysql-test/suite/galera/t/MW-44.test index b0e58e2bafd..09f444fdff4 100644 --- a/mysql-test/suite/galera/t/MW-44.test +++ b/mysql-test/suite/galera/t/MW-44.test @@ -5,16 +5,20 @@ --source include/galera_cluster.inc --source include/have_innodb.inc -SET @@global.wsrep_replicate_myisam=OFF; --connection node_1 +SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; SELECT COUNT(*) from mysql.general_log; +SELECT * FROM mysql.general_log; --connection node_2 +SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; SELECT COUNT(*) from mysql.general_log; +SELECT * FROM mysql.general_log; --connection node_1 +SET GLOBAL general_log='ON'; SELECT COUNT(*) from mysql.general_log; SET SESSION wsrep_osu_method=TOI; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; @@ -25,6 +29,7 @@ SET SESSION wsrep_osu_method=TOI; SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; --connection node_2 +SET GLOBAL general_log='ON'; SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%'; DROP TABLE t1; -SET @@global.wsrep_replicate_myisam=Default; +

1 0

[Commits] 326db1a: Mdev-14853 Grant does not work correctly when table contains...
by sachin 26 Apr '18

26 Apr '18

revision-id: 326db1a2aaa9b275a1a21a863e8cd2d9fa1b1d5f (mariadb-10.3.6-46-g326db1a) parent(s): 9477a2a9ba17c0db362e2bb39d5048e369096f39 author: Sachin Setiya committer: Sachin Setiya timestamp: 2018-04-26 12:47:25 +0530 message: Mdev-14853 Grant does not work correctly when table contains... SYSTEM_INVISIBLE or COMPLETELY_INVISIBLE This commit does multiple things to solve this mdev 1st add field into the parameter of check_column_grant_in_table_ref, so that we can find out field invisibility. 2nd If field->invisible >= INVISIBLE_SYSTEM skip access check and simple grant access. --- mysql-test/main/invisible_field_grant.result | 111 +++++++++++++++++++++++++++ mysql-test/main/invisible_field_grant.test | 77 +++++++++++++++++++ sql/sp_rcontext.cc | 9 ++- sql/sql_acl.cc | 11 ++- sql/sql_acl.h | 2 +- sql/sql_base.cc | 4 +- 6 files changed, 206 insertions(+), 8 deletions(-) diff --git a/mysql-test/main/invisible_field_grant.result b/mysql-test/main/invisible_field_grant.result new file mode 100644 index 0000000..c3ccbb1 --- /dev/null +++ b/mysql-test/main/invisible_field_grant.result @@ -0,0 +1,111 @@ +set @old_debug= @@debug_dbug; +create user user_1; +show grants for user_1; +Grants for user_1@% +GRANT USAGE ON *.* TO 'user_1'@'%' +# create user +create database d; +use d; + +#System_Invisible +set debug_dbug= "+d,test_pseudo_invisible"; +create table t1(a int); +set debug_dbug=@old_debug; +insert into t1 values(1); +select a,invisible from t1; +a invisible +1 9 +grant insert(a) on t1 to user_1; +grant update(a) on t1 to user_1; +grant select(a) on t1 to user_1; +grant delete on t1 to user_1; +connect con1, localhost, user_1,,test; +connection con1; +select user(); +user() +user_1@localhost +use d; +select * from t1; +a +1 +insert into t1 values(2); +select * from t1; +a +1 +2 +insert into t1(a) values(3); +select * from t1; +a +1 +2 +3 +select invisible,a from t1; +invisible a +9 1 +9 2 +9 3 +delete from t1 where a =1; +update t1 set a=1 where a=3; +select * from t1; +a +2 +1 +disconnect con1; + +#Cleanup +connection default; +drop table t1; +REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1; + +#Completely Invisible +set debug_dbug= "+d,test_completely_invisible"; +create table t1(a int); +insert into t1 values(1); +select a,invisible from t1; +a invisible +1 9 +set debug_dbug=@old_debug; +grant insert(a) on t1 to user_1; +grant update(a) on t1 to user_1; +grant select(a) on t1 to user_1; +grant delete on t1 to user_1; +connect con1, localhost, user_1,,test; +connection con1; +select user(); +user() +user_1@localhost +use d; +select * from t1; +a +1 +insert into t1 values(2); +select * from t1; +a +1 +2 +insert into t1(a) values(3); +select * from t1; +a +1 +2 +3 +select invisible,a from t1; +ERROR 42S22: Unknown column 'invisible' in 'field list' +delete from t1 where a =1; +update t1 set a=1 where a=3; +select * from t1; +a +2 +1 +disconnect con1; + +#Final Cleanup +connection default; +set debug_dbug= "+d,test_completely_invisible"; +select a,invisible from t1; +a invisible +2 9 +1 9 +drop user user_1; +drop database d; +set @old_debug= @@debug_dbug; diff --git a/mysql-test/main/invisible_field_grant.test b/mysql-test/main/invisible_field_grant.test new file mode 100644 index 0000000..0d627e5 --- /dev/null +++ b/mysql-test/main/invisible_field_grant.test @@ -0,0 +1,77 @@ +--source include/have_debug.inc +##TEST for invisible coloumn level 2 +set @old_debug= @@debug_dbug; +create user user_1; +show grants for user_1; +--echo # create user +create database d; +use d; + +--echo +--echo #System_Invisible +set debug_dbug= "+d,test_pseudo_invisible"; +create table t1(a int); +set debug_dbug=@old_debug; +insert into t1 values(1); +select a,invisible from t1; +grant insert(a) on t1 to user_1; +grant update(a) on t1 to user_1; +grant select(a) on t1 to user_1; +grant delete on t1 to user_1; +connect (con1, localhost, user_1,,test); +connection con1; +select user(); +use d; +select * from t1; +insert into t1 values(2); +select * from t1; +insert into t1(a) values(3); +select * from t1; +select invisible,a from t1; +delete from t1 where a =1; +update t1 set a=1 where a=3; +select * from t1; +disconnect con1; +--source include/wait_until_disconnected.inc + +--echo +--echo #Cleanup +--connection default +drop table t1; +REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1; + +--echo +--echo #Completely Invisible +set debug_dbug= "+d,test_completely_invisible"; +create table t1(a int); +insert into t1 values(1); +select a,invisible from t1; +set debug_dbug=@old_debug; +grant insert(a) on t1 to user_1; +grant update(a) on t1 to user_1; +grant select(a) on t1 to user_1; +grant delete on t1 to user_1; +connect (con1, localhost, user_1,,test); +connection con1; +select user(); +use d; +select * from t1; +insert into t1 values(2); +select * from t1; +insert into t1(a) values(3); +select * from t1; +--error ER_BAD_FIELD_ERROR +select invisible,a from t1; +delete from t1 where a =1; +update t1 set a=1 where a=3; +select * from t1; +disconnect con1; +--source include/wait_until_disconnected.inc +--echo +--echo #Final Cleanup +connection default; +set debug_dbug= "+d,test_completely_invisible"; +select a,invisible from t1; +drop user user_1; +drop database d; +set @old_debug= @@debug_dbug; diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index 2e9ae23..dc103fa 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -196,11 +196,12 @@ bool sp_rcontext::init_var_table(THD *thd, */ static inline bool check_column_grant_for_type_ref(THD *thd, TABLE_LIST *table_list, - const char *str, size_t length) + const char *str, size_t length, + Field *fld) { #ifndef NO_EMBEDDED_ACCESS_CHECKS table_list->table->grant.want_privilege= SELECT_ACL; - return check_column_grant_in_table_ref(thd, table_list, str, length); + return check_column_grant_in_table_ref(thd, table_list, str, length, fld); #else return false; #endif @@ -238,7 +239,7 @@ bool Qualified_column_ident::resolve_type_ref(THD *thd, Column_definition *def) { if (!(rc= check_column_grant_for_type_ref(thd, table_list, m_column.str, - m_column.length))) + m_column.length, src))) { *def= Column_definition(thd, src, NULL/*No defaults,no constraints*/); def->flags&= (uint) ~NOT_NULL_FLAG; @@ -302,7 +303,7 @@ bool Table_ident::resolve_table_rowtype_ref(THD *thd, LEX_CSTRING tmp= src[0]->field_name; Spvar_definition *def; if ((rc= check_column_grant_for_type_ref(thd, table_list, - tmp.str, tmp.length)) || + tmp.str, tmp.length,src[0])) || (rc= !(src[0]->field_name.str= thd->strmake(tmp.str, tmp.length))) || (rc= !(def= new (thd->mem_root) Spvar_definition(thd, *src)))) break; diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index de4e201..1c154a1 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -7775,6 +7775,8 @@ bool check_grant_column(THD *thd, GRANT_INFO *grant, table_ref table reference where to check the field name name of field to check length length of name + fld use fld object to check invisibility when it is + not 0, not_found_field, view_ref_found DESCRIPTION Check the access rights to a column depending on the type of table @@ -7789,13 +7791,17 @@ bool check_grant_column(THD *thd, GRANT_INFO *grant, */ bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref, - const char *name, size_t length) + const char *name, size_t length, + Field *fld) { GRANT_INFO *grant; const char *db_name; const char *table_name; Security_context *sctx= table_ref->security_ctx ? table_ref->security_ctx : thd->security_ctx; + if (fld && fld != not_found_field && fld != view_ref_found + && fld->invisible >= INVISIBLE_SYSTEM) + return false; if (table_ref->view || table_ref->field_translation) { @@ -7871,6 +7877,9 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg, for (; !fields->end_of_fields(); fields->next()) { + if (fields->field() && + fields->field()->invisible >= INVISIBLE_SYSTEM) + continue; LEX_CSTRING *field_name= fields->name(); if (table_name != fields->get_table_name()) diff --git a/sql/sql_acl.h b/sql/sql_acl.h index a608ef0..6da7d4d 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -239,7 +239,7 @@ bool check_grant_column (THD *thd, GRANT_INFO *grant, const char *db_name, const char *table_name, const char *name, size_t length, Security_context *sctx); bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref, - const char *name, size_t length); + const char *name, size_t length, Field *fld); bool check_grant_all_columns(THD *thd, ulong want_access, Field_iterator_table_ref *fields); bool check_grant_routine(THD *thd, ulong want_access, diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 0081365..383341c 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5880,7 +5880,7 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list, #ifndef NO_EMBEDDED_ACCESS_CHECKS /* Check if there are sufficient access rights to the found field. */ if (check_privileges && - check_column_grant_in_table_ref(thd, *actual_table, name, length)) + check_column_grant_in_table_ref(thd, *actual_table, name, length, fld)) fld= WRONG_GRANT; else #endif @@ -6057,7 +6057,7 @@ find_field_in_tables(THD *thd, Item_ident *item, #ifndef NO_EMBEDDED_ACCESS_CHECKS /* Check if there are sufficient access rights to the found field. */ if (found && check_privileges && - check_column_grant_in_table_ref(thd, table_ref, name, length)) + check_column_grant_in_table_ref(thd, table_ref, name, length, found)) found= WRONG_GRANT; #endif }

1 0

[Commits] 5bba69f: Fixed a compiler error
by IgorBabaev 26 Apr '18

26 Apr '18

revision-id: 5bba69f816129dff8f85e7e87c91b90e2d34b8e1 (mariadb-10.3.6-49-g5bba69f) parent(s): b4ee699a89ccf4f3cf52a18236e821f0d8466e8d author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-25 18:22:56 -0700 message: Fixed a compiler error --- tests/mysql_client_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 0140a63..fd33648 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -20295,9 +20295,10 @@ static void test_bulk_autoinc() static void print_metadata(MYSQL_RES *rs_metadata, int num_fields) { + int i; MYSQL_FIELD *fields= mysql_fetch_fields(rs_metadata); - for (int i = 0; i < num_fields; ++i) + for (i = 0; i < num_fields; ++i) { mct_log(" - %d: name: '%s'/'%s'; table: '%s'/'%s'; " "db: '%s'; catalog: '%s'; length: %d; max_length: %d; "

1 0

[Commits] ddb1e1d009a: MDEV-15732: Assertion `next_free_value % real_increment == offset && next_free_value >= reserved_until' failed in sequence_definition::adjust_values upon SETVAL for sequence with INCREMENT 0
by Oleksandr Byelkin 25 Apr '18

25 Apr '18

revision-id: ddb1e1d009aaf0272a46ffdd9977bcde32c89305 (mariadb-10.3.6-49-gddb1e1d009a) parent(s): b4ee699a89ccf4f3cf52a18236e821f0d8466e8d author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-04-25 21:32:47 +0200 message: MDEV-15732: Assertion `next_free_value % real_increment == offset && next_free_value >= reserved_until' failed in sequence_definition::adjust_values upon SETVAL for sequence with INCREMENT 0 there was 2 problems with "next_free_value >= reserved_until" condition: 1) it should be <= 2) SEQUENCE::set_value handle next_free_value & reserved_until after adjust_values() call, so it is incorect to put assert on it in adjust_values() --- mysql-test/suite/sql_sequence/setval.result | 15 +++++++++++++++ mysql-test/suite/sql_sequence/setval.test | 17 +++++++++++++++++ sql/sql_sequence.cc | 3 +-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/sql_sequence/setval.result b/mysql-test/suite/sql_sequence/setval.result index b7cda27cf96..504d460fea5 100644 --- a/mysql-test/suite/sql_sequence/setval.result +++ b/mysql-test/suite/sql_sequence/setval.result @@ -254,3 +254,18 @@ def SETVAL(s1,10) 8 20 2 Y 32896 0 63 SETVAL(s1,10) 10 DROP SEQUENCE s1; +# +# MDEV-15732: Assertion `next_free_value % real_increment == offset && +# next_free_value >= reserved_until' failed in +# sequence_definition::adjust_values upon SETVAL for sequence with +# INCREMENT 0 +# +CREATE SEQUENCE s INCREMENT 0; +SELECT NEXTVAL(s); +NEXTVAL(s) +1 +SELECT SETVAL(s, 10); +SETVAL(s, 10) +10 +DROP SEQUENCE s; +# End of 10.3 tests diff --git a/mysql-test/suite/sql_sequence/setval.test b/mysql-test/suite/sql_sequence/setval.test index 8f8059fdcae..1993bdbe077 100644 --- a/mysql-test/suite/sql_sequence/setval.test +++ b/mysql-test/suite/sql_sequence/setval.test @@ -137,3 +137,20 @@ SELECT SETVAL(s1,10); DROP SEQUENCE s1; --enable_ps_protocol --disable_metadata + +--echo # +--echo # MDEV-15732: Assertion `next_free_value % real_increment == offset && +--echo # next_free_value >= reserved_until' failed in +--echo # sequence_definition::adjust_values upon SETVAL for sequence with +--echo # INCREMENT 0 +--echo # + +CREATE SEQUENCE s INCREMENT 0; +SELECT NEXTVAL(s); +SELECT SETVAL(s, 10); + +# Cleanup +DROP SEQUENCE s; + + +--echo # End of 10.3 tests diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index 18f0028908f..4d0f15386e7 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -560,8 +560,7 @@ void sequence_definition::adjust_values(longlong next_value) else { next_free_value+= to_add; - DBUG_ASSERT(next_free_value % real_increment == offset && - next_free_value >= reserved_until); + DBUG_ASSERT(next_free_value % real_increment == offset); } } }

1 0

[Commits] 705878cfe77: postreview fix
by Oleksandr Byelkin 25 Apr '18

25 Apr '18

revision-id: 705878cfe770ffd62b743e9e9f5eb70442e0d54c (mariadb-10.3.6-49-g705878cfe77) parent(s): a50fb913cf24b3234f2e9de7b0d8740031ac4985 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-04-25 17:16:17 +0200 message: postreview fix --- sql/sql_class.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 0ec95e11829..09a2d205d85 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2664,7 +2664,6 @@ void THD::prepare_explain_fields(select_result *result, uint8 explain_flags, bool is_analyze) { - ; if (lex->explain_json) make_explain_json_field_list(*field_list, is_analyze); else

1 0