- commits - lists.mariadb.org

[Commits] 2ad51a0: MDEV-17095 pam_user_map module throws syntax error if group name contains backslash.
by holyfoot＠askmonty.org 30 Aug '18

30 Aug '18

revision-id: 2ad51a0bd8380fba3d03a4cebd43860329b7fbaa (mariadb-10.1.35-18-g2ad51a0) parent(s): 104089e182f31524d85409bd59f1889e36d4636a committer: Alexey Botchkov timestamp: 2018-08-30 14:51:15 +0400 message: MDEV-17095 pam_user_map module throws syntax error if group name contains backslash. Let '\\' and '/' symbols to be part of a group name. --- plugin/auth_pam/mapper/pam_user_map.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugin/auth_pam/mapper/pam_user_map.c b/plugin/auth_pam/mapper/pam_user_map.c index c03ea12..e1d11aca 100644 --- a/plugin/auth_pam/mapper/pam_user_map.c +++ b/plugin/auth_pam/mapper/pam_user_map.c @@ -189,13 +189,15 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, s++; } from= s; - skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || (*s == '$')); + skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || + (*s == '$') || (*s == '\\') || (*s == '/')); end_from= s; skip(isspace(*s)); if (end_from == from || *s++ != ':') goto syntax_error; skip(isspace(*s)); to= s; - skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || (*s == '$')); + skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || + (*s == '$')); end_to= s; if (end_to == to) goto syntax_error;

1 0

[Commits] 290368e: MyRocks: post-merge fixes part #6: make rocksdb.allow_no_primary_key test pass
by psergey＠askmonty.org 30 Aug '18

30 Aug '18

revision-id: 290368e74065bcdf9e5cb3d5836bf3783080dea1 parent(s): 5e4f3af9b7b7ad46dae09d5020f9147cadffc14e committer: Sergei Petrunia branch nick: 10.2-mariarocks-merge timestamp: 2018-08-30 12:55:03 +0300 message: MyRocks: post-merge fixes part #6: make rocksdb.allow_no_primary_key test pass --- storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result index de8a1fb..a8d5c07 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result @@ -276,10 +276,10 @@ a 10 20 30 +connect con1,localhost,root,,; +connection con1; alter table t1 force; -select * from t1; -a -insert into t1 values (100); +connection default; select * from t1; a connection con1;

1 0

[Commits] b245023: MDEV-16992 Assertion `table_ref->table || table_ref->view' failed in
by IgorBabaev 30 Aug '18

30 Aug '18

revision-id: b245023fe0bc6fa0bd6e2dfa9352b30b71d0d27d (mariadb-10.2.16-109-gb245023) parent(s): a8bf27c7157374e3c1c4fa1b300ed6df195dda7b author: Igor Babaev committer: Igor Babaev timestamp: 2018-08-30 00:51:39 -0700 message: MDEV-16992 Assertion `table_ref->table || table_ref->view' failed in Field_iterator_table_ref::set_field_iterator Several functions that processed different prepare statements missed the DT_INIT flag in last parameter of the open_normal_and_derived_tables() calls. It made context analysis of derived tables dependent on the order in which the derived tables were processed by mysql_handle_derived(). This order was induced by the order of SELECTs in all_select_list. In 10.4 the order of SELECTs in all_select_list became different and lack of the DT_INIT flags in some open_normal_and_derived_tables() call became critical as some derived tables were not identified as such. --- mysql-test/r/ps.result | 43 +++++++++++++++++++++++++++++++++++++++++++ mysql-test/t/ps.test | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sql/sql_prepare.cc | 13 +++++++------ 3 files changed, 96 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 4a1922e..2431e5d 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -5244,5 +5244,48 @@ DROP PROCEDURE p2; DROP PROCEDURE p1; DROP ROLE testrole; # +# MDEV-16992: prepare of CREATE TABLE, CREATE VIEW, DO, SET, CALL +# statements with CTE containing materialized derived +# (the bug is reproducible on 10.4) +# +prepare stmt from +"CREATE TABLE t1 AS + WITH cte(a) AS (SELECT * FROM (SELECT 1) AS t) SELECT * FROM cte;"; +execute stmt; +select * from t1; +a +1 +prepare stmt from +"CREATE VIEW v1 AS + WITH cte(a) AS (SELECT * FROM (SELECT 1) AS t) SELECT * FROM cte;"; +execute stmt; +select * from v1; +a +1 +prepare stmt from +"DO (SELECT 1 + FROM (WITH cte AS (SELECT * FROM (SELECT 1) AS t) + SELECT * FROM cte) AS tt);"; +execute stmt; +prepare stmt from +"SET @a = (SELECT 1 + FROM (WITH cte AS (SELECT * FROM (SELECT 1) AS t) + SELECT * FROM cte) AS t);"; +execute stmt; +create procedure p (i int) insert into t1 values(i); +prepare stmt from +"CALL p + ((SELECT 1 + FROM (WITH cte AS (SELECT * FROM (SELECT 1) AS t) + SELECT * FROM cte) AS tt));"; +execute stmt; +select * from t1; +a +1 +1 +drop procedure p; +drop view v1; +drop table t1; +# # End of 10.2 tests # diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index c826bff..9acae10 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -4748,5 +4748,51 @@ DROP PROCEDURE p1; DROP ROLE testrole; --echo # +--echo # MDEV-16992: prepare of CREATE TABLE, CREATE VIEW, DO, SET, CALL +--echo # statements with CTE containing materialized derived +--echo # (the bug is reproducible on 10.4) +--echo # + +--enable_result_log + +prepare stmt from +"CREATE TABLE t1 AS + WITH cte(a) AS (SELECT * FROM (SELECT 1) AS t) SELECT * FROM cte;"; +execute stmt; +select * from t1; + +prepare stmt from +"CREATE VIEW v1 AS + WITH cte(a) AS (SELECT * FROM (SELECT 1) AS t) SELECT * FROM cte;"; +execute stmt; +select * from v1; + +prepare stmt from +"DO (SELECT 1 + FROM (WITH cte AS (SELECT * FROM (SELECT 1) AS t) + SELECT * FROM cte) AS tt);"; +execute stmt; + +prepare stmt from +"SET @a = (SELECT 1 + FROM (WITH cte AS (SELECT * FROM (SELECT 1) AS t) + SELECT * FROM cte) AS t);"; +execute stmt; + +create procedure p (i int) insert into t1 values(i); + +prepare stmt from +"CALL p + ((SELECT 1 + FROM (WITH cte AS (SELECT * FROM (SELECT 1) AS t) + SELECT * FROM cte) AS tt));"; +execute stmt; +select * from t1; + +drop procedure p; +drop view v1; +drop table t1; + +--echo # --echo # End of 10.2 tests --echo # diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index d209707..0d7b043 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1637,7 +1637,7 @@ static bool mysql_test_do_fields(Prepared_statement *stmt, DBUG_RETURN(TRUE); if (open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL, - DT_PREPARE | DT_CREATE)) + DT_INIT | DT_PREPARE | DT_CREATE)) DBUG_RETURN(TRUE); DBUG_RETURN(setup_fields(thd, Ref_ptr_array(), *values, MARK_COLUMNS_NONE, 0, NULL, 0)); @@ -1669,7 +1669,7 @@ static bool mysql_test_set_fields(Prepared_statement *stmt, if ((tables && check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE)) || open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL, - DT_PREPARE | DT_CREATE)) + DT_INIT | DT_PREPARE | DT_CREATE)) goto error; while ((var= it++)) @@ -1706,7 +1706,8 @@ static bool mysql_test_call_fields(Prepared_statement *stmt, if ((tables && check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE)) || - open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL, DT_PREPARE)) + open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL, + DT_INIT | DT_PREPARE)) goto err; while ((item= it++)) @@ -1833,7 +1834,7 @@ static bool mysql_test_create_table(Prepared_statement *stmt) if (open_normal_and_derived_tables(stmt->thd, lex->query_tables, MYSQL_OPEN_FORCE_SHARED_MDL, - DT_PREPARE | DT_CREATE)) + DT_INIT | DT_PREPARE | DT_CREATE)) DBUG_RETURN(TRUE); select_lex->context.resolve_in_select_list= TRUE; @@ -1854,7 +1855,7 @@ static bool mysql_test_create_table(Prepared_statement *stmt) */ if (open_normal_and_derived_tables(stmt->thd, lex->query_tables, MYSQL_OPEN_FORCE_SHARED_MDL, - DT_PREPARE)) + DT_INIT | DT_PREPARE)) DBUG_RETURN(TRUE); } @@ -2081,7 +2082,7 @@ static bool mysql_test_create_view(Prepared_statement *stmt) lex->context_analysis_only|= CONTEXT_ANALYSIS_ONLY_VIEW; if (open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL, - DT_PREPARE)) + DT_INIT | DT_PREPARE)) goto err; res= select_like_stmt_test(stmt, 0, 0);

1 0

[Commits] 104089e182f: MDEV-15512 - Fix sh parse error when [sst] config value has spaces.
by jan 29 Aug '18

29 Aug '18

revision-id: 104089e182f31524d85409bd59f1889e36d4636a (mariadb-10.1.35-17-g104089e182f) parent(s): 6c588c92a9b17c5478c60713c7d5b17a38044295 author: Jan Lindström committer: Jan Lindström timestamp: 2018-08-29 19:30:03 +0300 message: MDEV-15512 - Fix sh parse error when [sst] config value has spaces. Merged https://github.com/MariaDB/server/pull/617 authored by Colin Mollenhour. --- scripts/wsrep_sst_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index 7f1f44d0cdb..bc26cec6d83 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -277,8 +277,8 @@ parse_cnf() reval=$($MY_PRINT_DEFAULTS "${group}" | awk -v var="${var}" 'BEGIN { OFS=FS="=" } { gsub(/_/,"-",$1); if ( $1=="--"var) lastval=substr($0,length($1)+2) } END { print lastval}') # use default if we haven't found a value - if [ -z $reval ]; then - [ -n $3 ] && reval=$3 + if [ -z "$reval" ]; then + [ -n "$3" ] && reval=$3 fi echo $reval }

1 0

[Commits] 5e4f3af: MyRocks: post-merge fixes part #5: make rocksdb.rocksdb_checksums test pass
by psergey＠askmonty.org 29 Aug '18

29 Aug '18

revision-id: 5e4f3af9b7b7ad46dae09d5020f9147cadffc14e parent(s): 3d2c0f61e71adb80b914e9b87e57be90cb881def committer: Sergei Petrunia branch nick: 10.2-mariarocks-merge timestamp: 2018-08-29 17:25:58 +0300 message: MyRocks: post-merge fixes part #5: make rocksdb.rocksdb_checksums test pass --- mysql-test/include/search_pattern_in_file.inc | 16 ++++++++++++++-- .../mysql-test/rocksdb/r/rocksdb_checksums.result | 21 ++++++++++++++++++--- .../mysql-test/rocksdb/t/rocksdb_checksums.test | 15 +++++++++------ 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/mysql-test/include/search_pattern_in_file.inc b/mysql-test/include/search_pattern_in_file.inc index 21192b5..6bead62 100644 --- a/mysql-test/include/search_pattern_in_file.inc +++ b/mysql-test/include/search_pattern_in_file.inc @@ -18,6 +18,11 @@ # Optionally, SEARCH_ABORT can be set to "FOUND" or "NOT FOUND" and this # will abort if the search result doesn't match the requested one. # +# Optionally, SEARCH_OUTPUT can be set to control the format of output. +# Supported formats: +# - (default) : "FOUND n /pattern/ in FILE " or "NOT FOUND ..." +# - "matches" : Each match is printed, on a separate line +# # In case of # - SEARCH_FILE and/or SEARCH_PATTERN is not set # - SEARCH_FILE cannot be opened @@ -75,7 +80,14 @@ perl; my @matches=($content =~ m/$search_pattern/gs); my $res=@matches ? "FOUND " . scalar(@matches) : "NOT FOUND"; $ENV{SEARCH_FILE} =~ s{^.*?([^/\\]+)$}{$1}; - print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n"; + + if ($ENV{SEARCH_OUTPUT} eq "matches") { + foreach (@matches) { + print $_ . "\n"; + } + } else { + print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n"; + } die "$ENV{SEARCH_ABORT}\n" - if $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/; + if $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/; EOF diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result index 17ddb6f..505487c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_checksums.result @@ -11,7 +11,12 @@ insert into t1 values (1,1,1),(2,2,2),(3,3,3); check table t1; Table Op Msg_type Msg_text test.t1 check status OK -FOUND 1 /0 table records had checksums/ in mysqld.1.err +CHECKTABLE t1: Checking table t1 +CHECKTABLE t1: Checking index a +CHECKTABLE t1: ... 3 index entries checked (0 had checksums) +CHECKTABLE t1: Checking index b +CHECKTABLE t1: ... 3 index entries checked (0 had checksums) +CHECKTABLE t1: 0 table records had checksums drop table t1; set session rocksdb_store_row_debug_checksums=on; create table t2 (pk int primary key, a int, b int, key(a), key(b)) engine=rocksdb; @@ -19,7 +24,12 @@ insert into t2 values (1,1,1),(2,2,2),(3,3,3); check table t2; Table Op Msg_type Msg_text test.t2 check status OK -FOUND 1 /3 table records had checksums/ in mysqld.1.err +CHECKTABLE t2: Checking table t2 +CHECKTABLE t2: Checking index a +CHECKTABLE t2: ... 3 index entries checked (3 had checksums) +CHECKTABLE t2: Checking index b +CHECKTABLE t2: ... 3 index entries checked (3 had checksums) +CHECKTABLE t2: 3 table records had checksums # Now, make a table that has both rows with checksums and without create table t3 (pk int primary key, a int, b int, key(a), key(b)) engine=rocksdb; insert into t3 values (1,1,1),(2,2,2),(3,3,3); @@ -29,7 +39,12 @@ set session rocksdb_store_row_debug_checksums=on; check table t3; Table Op Msg_type Msg_text test.t3 check status OK -FOUND 1 /2 table records had checksums/ in mysqld.1.err +CHECKTABLE t3: Checking table t3 +CHECKTABLE t3: Checking index a +CHECKTABLE t3: ... 3 index entries checked (3 had checksums) +CHECKTABLE t3: Checking index b +CHECKTABLE t3: ... 3 index entries checked (2 had checksums) +CHECKTABLE t3: 2 table records had checksums set session rocksdb_store_row_debug_checksums=on; set session rocksdb_checksums_pct=5; create table t4 (pk int primary key, a int, b int, key(a), key(b)) engine=rocksdb; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_checksums.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_checksums.test index 99dbc42..42a4c83 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_checksums.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_checksums.test @@ -19,8 +19,10 @@ show variables like 'rocksdb_%checksum%'; create table t1 (pk int primary key, a int, b int, key(a), key(b)) engine=rocksdb; insert into t1 values (1,1,1),(2,2,2),(3,3,3); check table t1; ---let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err +--let SEARCH_FILE=$LOG --let SEARCH_PATTERN=0 table records had checksums +--let SEARCH_PATTERN=CHECKTABLE t1[^\n]* +--let SEARCH_OUTPUT=matches --source include/search_pattern_in_file.inc drop table t1; @@ -29,7 +31,7 @@ set session rocksdb_store_row_debug_checksums=on; create table t2 (pk int primary key, a int, b int, key(a), key(b)) engine=rocksdb; insert into t2 values (1,1,1),(2,2,2),(3,3,3); check table t2; ---let SEARCH_PATTERN=3 table records had checksums +--let SEARCH_PATTERN=CHECKTABLE t2[^\n]* --source include/search_pattern_in_file.inc --echo # Now, make a table that has both rows with checksums and without @@ -39,7 +41,7 @@ set session rocksdb_store_row_debug_checksums=off; update t3 set b=3 where a=2; set session rocksdb_store_row_debug_checksums=on; check table t3; ---let SEARCH_PATTERN=2 table records had checksums +--let SEARCH_PATTERN=CHECKTABLE t3[^\n]* --source include/search_pattern_in_file.inc set session rocksdb_store_row_debug_checksums=on; @@ -58,11 +60,12 @@ while ($i<4000) --enable_query_log check table t4; perl; -$total=10000; +$total=4000; $pct=5; @out=(); -$filename= "$ENV{MYSQLTEST_VARDIR}/log/mysqld.1.err"; +$filename= "$ENV{LOG}"; +print $filename "\n"; open(F, '<', $filename) || die("Can't open file $filename: $!"); while(<F>) { @out=() if /^CURRENT_TEST:/; @@ -144,6 +147,6 @@ set @@global.rocksdb_verify_row_debug_checksums=@save_rocksdb_verify_row_debug_c set @@global.rocksdb_checksums_pct=@save_rocksdb_checksums_pct; --source include/restart_mysqld.inc ---remove_file $LOG +#--remove_file $LOG drop table t2,t3,t4;

1 0

[Commits] f561fd77505: Merge branch 'patch-1' of https://github.com/colinmollenhour/server into colinmollenhour-patch-1
by jan 29 Aug '18

29 Aug '18

revision-id: f561fd7750564f61d1f4c8de8f042c3c23f5cfe3 (mariadb-10.3.7-35-gf561fd77505) parent(s): 898a8c3c0ce2c56773865521c59d5ac172495978 396e1835a839dc1a222fa89fc751eede10b933ba author: Jan Lindström committer: Jan Lindström timestamp: 2018-08-29 10:42:06 +0300 message: Merge branch 'patch-1' of https://github.com/colinmollenhour/server into colinmollenhour-patch-1 scripts/wsrep_sst_common.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --cc scripts/wsrep_sst_common.sh index e72b74ab6d1,0579ddc35ac..ef5a295d36f --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@@ -253,15 -258,24 +253,23 @@@ parse_cnf( local var=$2 local reval="" - # print the default settings for given group using my_print_default. # normalize the variable names specified in cnf file (user can use _ or - for example log-bin or log_bin) - # then grep for needed variable + # then search for needed variable # finally get the variable value (if variables has been specified multiple time use the last value only) - reval=$($MY_PRINT_DEFAULTS "${group}" | awk -v var="${var}" 'BEGIN { OFS=FS="=" } { gsub(/_/,"-",$1); if ( $1=="--"var) lastval=substr($0,length($1)+2) } END { print lastval}') + # look in group+suffix + if [ -n $WSREP_SST_OPT_CONF_SUFFIX ]; then + reval=$($MY_PRINT_DEFAULTS "${group}${WSREP_SST_OPT_CONF_SUFFIX}" | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2- | tail -1) + fi + + # look in group + if [ -z "$reval" ]; then + reval=$($MY_PRINT_DEFAULTS $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2- | tail -1) + fi # use default if we haven't found a value - if [ -z $reval ]; then - [ -n $3 ] && reval=$3 + if [ -z "$reval" ]; then + [ -n "$3" ] && reval=$3 fi echo $reval }

1 0

[Commits] 3d2c0f6: MyRocks: Post-merge testcase fixes part #4
by psergey＠askmonty.org 28 Aug '18

28 Aug '18

revision-id: 3d2c0f61e71adb80b914e9b87e57be90cb881def parent(s): 138605c3b715f15c74a9350320e2ccc5ea2c0e38 committer: Sergei Petrunia branch nick: 10.2-mariarocks-merge timestamp: 2018-08-28 17:35:52 +0300 message: MyRocks: Post-merge testcase fixes part #4 --- .../rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result | 1 + storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result | 8 ++++---- .../mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result | 13 ++++++++++--- storage/rocksdb/rdb_i_s.cc | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result index aab6e82..df27fbe 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result @@ -78,6 +78,7 @@ ROCKSDB_CF_OPTIONS Stable ROCKSDB_COMPACTION_STATS Stable ROCKSDB_GLOBAL_INFO Stable ROCKSDB_DDL Stable +ROCKSDB_SST_PROPS Stable ROCKSDB_INDEX_FILE_MAP Stable ROCKSDB_LOCKS Stable ROCKSDB_TRX Stable diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result index c6e15dc..2044310 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result @@ -1503,8 +1503,8 @@ Rocksdb_block_cache_index_miss # Rocksdb_block_cache_miss # Rocksdb_block_cachecompressed_hit # Rocksdb_block_cachecompressed_miss # -rocksdb_bloom_filter_full_positive # -rocksdb_bloom_filter_full_true_positive # +Rocksdb_bloom_filter_full_positive # +Rocksdb_bloom_filter_full_true_positive # Rocksdb_bloom_filter_prefix_checked # Rocksdb_bloom_filter_prefix_useful # Rocksdb_bloom_filter_useful # @@ -1521,12 +1521,12 @@ Rocksdb_get_hit_l1 # Rocksdb_get_hit_l2_and_up # Rocksdb_getupdatessince_calls # Rocksdb_iter_bytes_read # +Rocksdb_manual_compactions_processed # +Rocksdb_manual_compactions_running # Rocksdb_memtable_hit # Rocksdb_memtable_miss # Rocksdb_no_file_closes # Rocksdb_no_file_errors # -rocksdb_manual_compactions_processed # -rocksdb_manual_compactions_running # Rocksdb_no_file_opens # Rocksdb_num_iterators # Rocksdb_number_block_not_compressed # diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result index ca1ad57..ea25069 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result @@ -61,22 +61,29 @@ connection con1; i rollback; connection default; -disconnect con1; -disconnect con2; -disconnect con3; create table t1 (id int primary key, value int, value2 int, index(value)) engine=rocksdb; insert into t1 values (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10); +connection con1; begin; update t1 force index (value) set value2=value2+1 where value=3; +connection con2; begin; update t1 force index (value) set value2=value2+1 where value=2; update t1 force index (value) set value2=value2+1 where value=4; +connection con1; update t1 force index (value) set value2=value2+1 where value=4; +connection con2; update t1 force index (value) set value2=value2+1 where value=3; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +connection con1; rollback; +connection con2; rollback; drop table t1; +connection default; +disconnect con1; +disconnect con2; +disconnect con3; set global rocksdb_lock_wait_timeout = @prior_rocksdb_lock_wait_timeout; set global rocksdb_deadlock_detect = @prior_rocksdb_deadlock_detect; drop table t,r1,r2; diff --git a/storage/rocksdb/rdb_i_s.cc b/storage/rocksdb/rdb_i_s.cc index 9192795..36c9493 100644 --- a/storage/rocksdb/rdb_i_s.cc +++ b/storage/rocksdb/rdb_i_s.cc @@ -1906,7 +1906,7 @@ struct st_maria_plugin rdb_i_s_ddl = { nullptr, /* status variables */ nullptr, /* system variables */ nullptr, /* config options */ - 0, /* flags */ + MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL }; struct st_mysql_plugin rdb_i_s_sst_props = {

1 0

[Commits] 138605c: MyRocks: Post-merge testcase fixes part #3
by psergey＠askmonty.org 28 Aug '18

28 Aug '18

revision-id: 138605c3b715f15c74a9350320e2ccc5ea2c0e38 parent(s): f561e63fdd901a07d89417e45f6f7db2585ba13f committer: Sergei Petrunia branch nick: 10.2-mariarocks-merge timestamp: 2018-08-28 16:30:22 +0300 message: MyRocks: Post-merge testcase fixes part #3 --- storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result | 4 ++-- storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result | 2 +- .../mysql-test/rocksdb/r/secondary_key_update_lock.result | 9 ++++++++- storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result | 2 +- .../rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result index 058d360..4f6702b 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result @@ -27,7 +27,7 @@ set global rocksdb_force_flush_memtable_now=1; explain select * from t1 limit 10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 10000 NULL +1 SIMPLE t1 ALL NULL NULL NULL NULL 10000 select * from t1 limit 10; id1 id2 id3 id4 id5 value value2 1000 2000 2000 10000 10000 1000 aaabbbccc @@ -44,7 +44,7 @@ id1 id2 id3 id4 id5 value value2 explain select * from t1 order by id1 desc,id2 desc, id3 desc, id4 desc limit 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL PRIMARY 122 NULL 1 NULL +1 SIMPLE t1 index NULL PRIMARY 122 NULL 1 select * from t1 order by id1 desc,id2 desc, id3 desc, id4 desc limit 1; id1 id2 id3 id4 id5 value value2 1000 2000 2000 10000 10000 1000 aaabbbccc diff --git a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result index 0619e2d..3ec9294 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result @@ -14,7 +14,7 @@ show create table information_schema.rocksdb_deadlock; Table Create Table ROCKSDB_DEADLOCK CREATE TEMPORARY TABLE `ROCKSDB_DEADLOCK` ( `DEADLOCK_ID` bigint(8) NOT NULL DEFAULT 0, - `TIMESTAMP` bigint(8) NOT NULL DEFAULT '0', + `TIMESTAMP` bigint(8) NOT NULL DEFAULT 0, `TRANSACTION_ID` bigint(8) NOT NULL DEFAULT 0, `CF_NAME` varchar(193) NOT NULL DEFAULT '', `WAITING_KEY` varchar(513) NOT NULL DEFAULT '', diff --git a/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result b/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result index 1d7a519..1421782 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result @@ -1,11 +1,18 @@ +connect con, localhost, root,,; +connection default; create table t1 (a int primary key, b int unique key) engine = rocksdb; insert into t1 values(1, 1); +connection con; begin; update t1 set b = 2 where b = 1; +connection default; insert into t1 values(2, 1); -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: test.t1.b +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +connection con; rollback; select * from t1; a b 1 1 +connection default; drop table t1; +disconnect con; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result index 45a21c3..8a4ee14 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result @@ -3,7 +3,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY DEFAULT '0', a INT(11), b CHAR(8)) ENGINE=ro SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `pk` int(11) NOT NULL DEFAULT '0', + `pk` int(11) NOT NULL DEFAULT 0, `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) diff --git a/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test b/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test index 5ca8e0b..46ea7f0 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test @@ -1,5 +1,5 @@ --source include/have_rocksdb.inc ---source suite/rocksdb/include/have_write_committed.inc +--source include/have_write_committed.inc --disable_warnings DROP TABLE IF EXISTS t1;

1 0

[Commits] f561e63: MyRocks: Post-merge testcase fixes part #2
by psergey＠askmonty.org 28 Aug '18

28 Aug '18

revision-id: f561e63fdd901a07d89417e45f6f7db2585ba13f parent(s): a01823a33f93546f4990692979a4d5110b4d283d committer: Sergei Petrunia branch nick: 10.2-mariarocks-merge timestamp: 2018-08-28 16:18:02 +0300 message: MyRocks: Post-merge testcase fixes part #2 --- storage/rocksdb/mysql-test/rocksdb/r/drop_table.result | 8 ++++++++ .../mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result | 13 ++++++++++--- storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 2 +- storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result b/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result index 2695f0b..4d20242 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result @@ -47,15 +47,23 @@ DELETE FROM t1; DELETE FROM t4; SET GLOBAL rocksdb_max_manual_compactions = 2; SET GLOBAL rocksdb_debug_manual_compaction_delay = 3600; +connect con1, localhost, root,,; +connect con2, localhost, root,,; +connect con3, localhost, root,,; +connection con1; SET GLOBAL rocksdb_compact_cf='cf1'; +connection con2; SET GLOBAL rocksdb_compact_cf='rev:cf2'; +connection default; select * from information_schema.global_status where variable_name='rocksdb_manual_compactions_running'; VARIABLE_NAME VARIABLE_VALUE ROCKSDB_MANUAL_COMPACTIONS_RUNNING 1 +connection con3; SET GLOBAL rocksdb_compact_cf='cf1'; ERROR HY000: Internal error: Can't schedule more manual compactions. Increase rocksdb_max_manual_compactions or stop issuing more manual compactions. SET GLOBAL rocksdb_compact_cf='rev:cf2'; ERROR HY000: Internal error: Can't schedule more manual compactions. Increase rocksdb_max_manual_compactions or stop issuing more manual compactions. +connection default; drop table t4; CREATE TABLE t5 ( a int not null, diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result index ca1ad57..ea25069 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result @@ -61,22 +61,29 @@ connection con1; i rollback; connection default; -disconnect con1; -disconnect con2; -disconnect con3; create table t1 (id int primary key, value int, value2 int, index(value)) engine=rocksdb; insert into t1 values (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10); +connection con1; begin; update t1 force index (value) set value2=value2+1 where value=3; +connection con2; begin; update t1 force index (value) set value2=value2+1 where value=2; update t1 force index (value) set value2=value2+1 where value=4; +connection con1; update t1 force index (value) set value2=value2+1 where value=4; +connection con2; update t1 force index (value) set value2=value2+1 where value=3; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +connection con1; rollback; +connection con2; rollback; drop table t1; +connection default; +disconnect con1; +disconnect con2; +disconnect con3; set global rocksdb_lock_wait_timeout = @prior_rocksdb_lock_wait_timeout; set global rocksdb_deadlock_detect = @prior_rocksdb_deadlock_detect; drop table t,r1,r2; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index 0498c9a..23c9c5d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def +++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def @@ -22,7 +22,7 @@ native_procedure : Not supported in MariaDB slow_query_log: MDEV-11480 select_for_update_skip_locked_nowait: MDEV-11481 create_no_primary_key_table: MariaDB doesn't have --block_create_no_primary_key - +explicit_snapshot: MariaDB doesn't support Shared/Explicit snapshots ## ## Tests that do not fit MariaDB's test environment. Upstream seems to test diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test index f4fdaa7..13f1bd6 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test @@ -1,6 +1,6 @@ --source include/have_rocksdb.inc --source include/have_partition.inc ---source suite/rocksdb/include/have_write_committed.inc +--source include/have_write_committed.inc # # RocksDB Storage Engine tests

1 0

[Commits] a9be8557c4f: MDEV-17032: Estimates are higher for partitions of a table with @@use_stat_tables= PREFERABLY
by Varun 28 Aug '18

28 Aug '18

revision-id: a9be8557c4f7fe52efd2c5231f95adb0bad8d80a (mariadb-10.0.36-12-ga9be8557c4f) parent(s): 880a22e5c4aa7239b3244ba1b83854955295e849 author: Varun Gupta committer: Varun Gupta timestamp: 2018-08-28 16:54:46 +0530 message: MDEV-17032: Estimates are higher for partitions of a table with @@use_stat_tables= PREFERABLY The problem here is EITS statistics does not calculate statistics for the partitions of the table. So a temporary solution would be to not read EITS statistics for partitioned tables. --- mysql-test/r/partition.result | 27 +++++++++++++++++++++++++++ mysql-test/t/partition.test | 22 ++++++++++++++++++++++ sql/sql_statistics.cc | 6 ++++++ 3 files changed, 55 insertions(+) diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index c6669176b3d..638e05eadb9 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -2645,3 +2645,30 @@ Warnings: Note 1517 Duplicate partition name p2 DEALLOCATE PREPARE stmt; DROP TABLE t1; +# +# MDEV-17032: Estimates are higher for partitions of a table with @@use_stat_tables= PREFERABLY +# +CREATE TABLE t1 (i int, a VARCHAR(1000) DEFAULT "AAA") +PARTITION BY RANGE COLUMNS (a)( +PARTITION p0 VALUES LESS THAN ('g') COMMENT "p0", +PARTITION p1 VALUES LESS THAN ('m'), +PARTITION p2 VALUES LESS THAN ('t'), +PARTITION p3 VALUES LESS THAN ('w')); +set @save_use_stat_tables= @@use_stat_tables; +set @@use_stat_tables=PREFERABLY; +ALTER TABLE t1 ADD PARTITION (PARTITION p4 VALUES LESS THAN (MAXVALUE)); +INSERT INTO t1 VALUES (3,REPEAT('r',300)),(4,NULL); +INSERT INTO t1 VALUES (5,REPEAT('k',500)),(6,'April'),(7,7),(9,"M"),(10,DEFAULT); +ALTER TABLE t1 ANALYZE PARTITION p1; +Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected +test.t1 analyze status OK +EXPLAIN PARTITIONS SELECT i,SUBSTRING(a,1,10) FROM t1 where (a>'m'); +id select_type table partitions type possible_keys key key_len ref rows Extra +1 SIMPLE t1 p2,p3,p4 ALL NULL NULL NULL NULL 2 Using where +set @@use_stat_tables=NEVER; +EXPLAIN PARTITIONS SELECT i,SUBSTRING(a,1,10) FROM t1 where (a>'m'); +id select_type table partitions type possible_keys key key_len ref rows Extra +1 SIMPLE t1 p2,p3,p4 ALL NULL NULL NULL NULL 2 Using where +set @use_stat_tables= @save_use_stat_tables; +drop table t1; diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 1c8cd0375d6..46758bc69b1 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -2897,3 +2897,25 @@ EXECUTE stmt; DEALLOCATE PREPARE stmt; DROP TABLE t1; +--echo # +--echo # MDEV-17032: Estimates are higher for partitions of a table with @@use_stat_tables= PREFERABLY +--echo # + +CREATE TABLE t1 (i int, a VARCHAR(1000) DEFAULT "AAA") + PARTITION BY RANGE COLUMNS (a)( + PARTITION p0 VALUES LESS THAN ('g') COMMENT "p0", + PARTITION p1 VALUES LESS THAN ('m'), + PARTITION p2 VALUES LESS THAN ('t'), + PARTITION p3 VALUES LESS THAN ('w')); +set @save_use_stat_tables= @@use_stat_tables; +set @@use_stat_tables=PREFERABLY; +ALTER TABLE t1 ADD PARTITION (PARTITION p4 VALUES LESS THAN (MAXVALUE)); +INSERT INTO t1 VALUES (3,REPEAT('r',300)),(4,NULL); +INSERT INTO t1 VALUES (5,REPEAT('k',500)),(6,'April'),(7,7),(9,"M"),(10,DEFAULT); +ALTER TABLE t1 ANALYZE PARTITION p1; +EXPLAIN PARTITIONS SELECT i,SUBSTRING(a,1,10) FROM t1 where (a>'m'); +set @@use_stat_tables=NEVER; +EXPLAIN PARTITIONS SELECT i,SUBSTRING(a,1,10) FROM t1 where (a>'m'); +set @use_stat_tables= @save_use_stat_tables; +drop table t1; + diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index cb75a5c2176..33a12588434 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -3589,6 +3589,12 @@ void set_statistics_for_table(THD *thd, TABLE *table) (use_stat_table_mode <= COMPLEMENTARY || !table->stats_is_read || read_stats->cardinality_is_null) ? table->file->stats.records : read_stats->cardinality; + + #ifdef WITH_PARTITION_STORAGE_ENGINE + if (table->part_info) + table->used_stat_records= table->file->stats.records; + #endif + KEY *key_info, *key_info_end; for (key_info= table->key_info, key_info_end= key_info+table->s->keys; key_info < key_info_end; key_info++)

1 0