- commits - lists.mariadb.org

[Commits] dd4e4479ebb: Remove tests from disabled.
by jan 20 Sep '18

20 Sep '18

revision-id: dd4e4479ebb4bae0e1a7dc3429229f450dced3da (mariadb-10.1.35-69-gdd4e4479ebb) parent(s): f887cb39d40a1cee0b3a2d6de24baa665d977efc author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-20 15:44:04 +0300 message: Remove tests from disabled. --- mysql-test/suite/galera/disabled.def | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 7359e1d9c05..689a969bea0 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -30,8 +30,6 @@ MW-388 : MDEV-13549 Galera test failures galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure galera_binlog_stmt_autoinc: MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit -galra_unicode_identifiers: MDEV-13871 galera.galera_unicode_identifiers failed in buildbot with 'Unknown database' -galera_suspend_slave: MDEV-13873 galera.galera_suspend_slave failed in buildbot with wrong error code partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion -query_cache : MDEV-15805 Test failure on galera.query_cache +

1 0

[Commits] ea3a92c3f7a: MDEV-14791: Crash with order by expression containing window functions
by varunraiko1803＠gmail.com 20 Sep '18

20 Sep '18

revision-id: ea3a92c3f7a7ba6a4957f305e85ee6fcb49c1ff4 (mariadb-10.2.16-128-gea3a92c3f7a) parent(s): fbe35f63afb537f5f4eba10375c4b0b0e613d438 author: Varun Gupta committer: Varun Gupta timestamp: 2018-09-20 17:57:44 +0530 message: MDEV-14791: Crash with order by expression containing window functions The issue here is that for a window function in the ORDER BY clause, we were not creating an extra field in the temporary table for the window function (which is contained in an expression). So a call to split_sum_func is added to handle this case --- mysql-test/r/win.result | 14 ++++++++++++++ mysql-test/t/win.test | 11 +++++++++++ sql/sql_select.cc | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index e6802075266..525eb4e2ab0 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3357,3 +3357,17 @@ GROUP BY i ) AS sq; ROW_NUMBER() OVER() i sum(i) drop table t1; +# +# MDEV-14791: Crash with order by expression containing window functions +# +CREATE TABLE t1 (b1 int, b2 int, b3 int, b4 int , b5 int, b6 int); +INSERT INTO t1 VALUES (1,0,0,1,0,1),(0,1,0,0,1,0); +explain +SELECT b1 from t1 order by row_number() over (ORDER BY b6) + 1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort +SELECT b1 from t1 order by row_number() over (ORDER BY b6) + 1; +b1 +1 +0 +DROP TABLE t1; diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test index 46345b65831..e3e4e992fa6 100644 --- a/mysql-test/t/win.test +++ b/mysql-test/t/win.test @@ -2125,3 +2125,14 @@ SELECT * FROM ( ) AS sq; drop table t1; +--echo # +--echo # MDEV-14791: Crash with order by expression containing window functions +--echo # + +CREATE TABLE t1 (b1 int, b2 int, b3 int, b4 int , b5 int, b6 int); +INSERT INTO t1 VALUES (1,0,0,1,0,1),(0,1,0,0,1,0); + +explain +SELECT b1 from t1 order by row_number() over (ORDER BY b6) + 1; +SELECT b1 from t1 order by row_number() over (ORDER BY b6) + 1; +DROP TABLE t1; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 9343fbd1bb1..cca23504230 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -933,7 +933,8 @@ JOIN::prepare(TABLE_LIST *tables_init, item->max_length))) real_order= TRUE; - if (item->with_sum_func && item->type() != Item::SUM_FUNC_ITEM) + if ((item->with_sum_func && item->type() != Item::SUM_FUNC_ITEM) || + item->with_window_func) item->split_sum_func(thd, ref_ptrs, all_fields, 0); } if (!real_order)

1 0

[Commits] f887cb39d40: Second bb run
by jan 20 Sep '18

20 Sep '18

revision-id: f887cb39d40a1cee0b3a2d6de24baa665d977efc (mariadb-10.1.35-68-gf887cb39d40) parent(s): dbfe5d566c34a18fd491758bc2785a17167553ce author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-20 15:39:52 +0300 message: Second bb run

1 0

[Commits] dbfe5d566c3: MDEV-15805: Test failure on galera.query_cache
by jan 20 Sep '18

20 Sep '18

revision-id: dbfe5d566c34a18fd491758bc2785a17167553ce (mariadb-10.1.35-67-gdbfe5d566c3) parent(s): 3177d266273b4aa79973c49a519299f54ca097e7 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-20 06:51:40 +0300 message: MDEV-15805: Test failure on galera.query_cache Reset query cache after every test case and add wait after load infile. --- .../suite/galera/include/reset_query_cache.inc | 11 ++ mysql-test/suite/galera/r/query_cache.result | 25 +---- mysql-test/suite/galera/t/query_cache.test | 119 ++++++++++++++++++--- 3 files changed, 119 insertions(+), 36 deletions(-) diff --git a/mysql-test/suite/galera/include/reset_query_cache.inc b/mysql-test/suite/galera/include/reset_query_cache.inc new file mode 100644 index 00000000000..6e33b886f08 --- /dev/null +++ b/mysql-test/suite/galera/include/reset_query_cache.inc @@ -0,0 +1,11 @@ +--disable_query_log +--disable_result_log +--connection node_1 +flush query cache; +reset query cache; + +--connection node_2 +flush query cache; +reset query cache; +--enable_result_log +--enable_query_log diff --git a/mysql-test/suite/galera/r/query_cache.result b/mysql-test/suite/galera/r/query_cache.result index 4b1b950e5c3..52cb990e1ab 100644 --- a/mysql-test/suite/galera/r/query_cache.result +++ b/mysql-test/suite/galera/r/query_cache.result @@ -402,22 +402,6 @@ Variable_name Value Qcache_queries_in_cache 1 set query_cache_type=on; # On node-1 -reset query cache; -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 0 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 -# On node-2 -reset query cache; -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 0 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 3 -# On node-1 select sql_no_cache * from t1; a 1 @@ -1247,16 +1231,13 @@ Qcache_queries_in_cache 0 show status like "Qcache_hits"; Variable_name Value Qcache_hits 12 -select count(*) from t1; -count(*) -70 # On node-2 select count(*) from t1; count(*) 70 show status like "Qcache_queries_in_cache"; Variable_name Value -Qcache_queries_in_cache 1 +Qcache_queries_in_cache 2 show status like "Qcache_hits"; Variable_name Value Qcache_hits 11 @@ -1558,7 +1539,7 @@ Variable_name Value Qcache_queries_in_cache 0 show status like "Qcache_inserts"; Variable_name Value -Qcache_inserts 38 +Qcache_inserts 39 show status like "Qcache_hits"; Variable_name Value Qcache_hits 11 @@ -1571,7 +1552,7 @@ Variable_name Value Qcache_queries_in_cache 1 show status like "Qcache_inserts"; Variable_name Value -Qcache_inserts 39 +Qcache_inserts 40 show status like "Qcache_hits"; Variable_name Value Qcache_hits 12 diff --git a/mysql-test/suite/galera/t/query_cache.test b/mysql-test/suite/galera/t/query_cache.test index 24ed8ecd077..a9374edc62a 100644 --- a/mysql-test/suite/galera/t/query_cache.test +++ b/mysql-test/suite/galera/t/query_cache.test @@ -113,6 +113,11 @@ show status like "Qcache_hits"; show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # MERGE TABLES with INSERT/UPDATE and DELETE # @@ -180,6 +185,11 @@ show status like "Qcache_hits"; drop table t1, t2, t3; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # SELECT SQL_CACHE ... # @@ -214,16 +224,7 @@ set query_cache_type=on; # # RESET QUERY CACHE # ---echo # On node-1 ---connection node_1 -reset query cache; -show status like "Qcache_queries_in_cache"; -show status like "Qcache_hits"; ---echo # On node-2 ---connection node_2 -reset query cache; -show status like "Qcache_queries_in_cache"; -show status like "Qcache_hits"; +--source include/reset_query_cache.inc # # SELECT SQL_NO_CACHE @@ -240,6 +241,11 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Check that queries that uses NOW(), LAST_INSERT_ID()... are not cached. # @@ -282,6 +288,11 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Non-cachable ODBC work around (and prepare cache for drop database) # @@ -316,6 +327,11 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Charset conversion (cp1251_koi8 always present) # Note: Queries using different default character sets are cached separately. @@ -343,6 +359,11 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Same tables in different dbs # @@ -376,6 +397,11 @@ show status like "Qcache_hits"; drop database mysqltest; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # FOUND_ROWS() # @@ -428,6 +454,11 @@ show status like "Qcache_queries_in_cache"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Test insert delayed (MYISAM) # @@ -526,6 +557,11 @@ drop table t2; set GLOBAL query_cache_min_res_unit=default; show global variables like "query_cache_min_res_unit"; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Case sensitive test # @@ -546,6 +582,11 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Test of query cache resizing # @@ -612,6 +653,11 @@ select * from t1; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Temporary tables (ignored by Galera) # @@ -645,6 +691,11 @@ show status like "Qcache_hits"; drop table t1, t2; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # System databse test (no need to perform it on node_2) # Note: Queries on system tables are not cached. @@ -697,6 +748,11 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; drop table t2; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Load data invalidation test # @@ -710,13 +766,13 @@ show status like "Qcache_hits"; eval load data infile '$MYSQLTEST_VARDIR/std_data/words.dat' into table t1; show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; -select count(*) from t1; - -# Wait for "load data" to replicate. ---sleep 5 +--let $wait_condition = SELECT COUNT(*) = 70 FROM t1; +--source include/wait_condition.inc --echo # On node-2 --connection node_2 +--let $wait_condition = SELECT COUNT(*) = 70 FROM t1; +--source include/wait_condition.inc select count(*) from t1; show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; @@ -728,6 +784,11 @@ select count(*) from t1; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # INTO OUTFILE/DUMPFILE test # @@ -748,6 +809,11 @@ let $datadir=`select @@datadir`; --remove_file $datadir/test/query_cache.dump.file --remove_file $datadir/test/query_cache.out.file +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Test of SQL_SELECT_LIMIT # @@ -777,6 +843,11 @@ SET SQL_SELECT_LIMIT=DEFAULT; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # WRITE LOCK & QC # @@ -844,6 +915,11 @@ select * from t1; drop table t1; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Test character set related variables: # character_set_result @@ -923,6 +999,11 @@ show status like "Qcache_queries_in_cache"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Comments before command # @@ -951,6 +1032,11 @@ show status like "Qcache_hits"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + # # Information schema & query cache test # @@ -988,6 +1074,11 @@ show status like 'qcache_queries_in_cache'; show status like "Qcache_hits"; drop table t1; +# +# RESET QUERY CACHE +# +--source include/reset_query_cache.inc + --echo # Restore original settings. --echo # On node-1 --connection node_1

1 0

[Commits] 69d95c1b79c: MDEV-17133 dump thread reads from a past position
by andrei.elkin＠pp.inet.fi 19 Sep '18

19 Sep '18

revision-id: 69d95c1b79c9cb0bfe92b47e2852ffeefbedffc7 (mariadb-10.1.35-59-g69d95c1b79c) parent(s): d3a8b5aa9cee24a6397662e30df2e915f45460e0 author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-09-19 14:09:02 +0300 message: MDEV-17133 dump thread reads from a past position According to logs analysis the Dump thread attempted to read again data which was already sent. The reason of regressed read turns out in an _my_b_cache_read() early exit branch which missed to distinguish between total zero size read (e.g when Count argument is zero) from a case when the data are fully read by sole accessing the cache's file. In the latter case this then effective reading must be reflected in the cache's state. Fixed with set up a separation mark (length= 0), retain early exit to the zero Count *and* when the mark is there, and conduct standard cache state change otherwise. --- mysys/mf_iocache.c | 7 ++-- unittest/sql/mf_iocache-t.cc | 83 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 56b1ae3fc6e..79893d6f7c1 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -563,7 +563,7 @@ int _my_b_write(IO_CACHE *info, const uchar *Buffer, size_t Count) int _my_b_cache_read(IO_CACHE *info, uchar *Buffer, size_t Count) { - size_t length, diff_length, left_length= 0, max_length; + size_t length= 0, diff_length, left_length= 0, max_length; my_off_t pos_in_file; DBUG_ENTER("_my_b_cache_read"); @@ -668,7 +668,10 @@ int _my_b_cache_read(IO_CACHE *info, uchar *Buffer, size_t Count) else { info->error= 0; - DBUG_RETURN(0); /* EOF */ + if (length == 0) /* nothing was read */ + DBUG_RETURN(0); /* EOF */ + + length= 0; /* non-zero size read was done */ } } else if ((length= mysql_file_read(info->file,info->buffer, max_length, diff --git a/unittest/sql/mf_iocache-t.cc b/unittest/sql/mf_iocache-t.cc index 8f97745f0fc..3f28134084d 100644 --- a/unittest/sql/mf_iocache-t.cc +++ b/unittest/sql/mf_iocache-t.cc @@ -285,11 +285,91 @@ void mdev14014() close_cached_file(&info); } +void mdev17133() +{ + int res, k; + const int eof_iter=16, read_iter= 16; + uchar buf_i[1024*256]; // read + uchar buf_o[sizeof(buf_i)]; // write + const size_t eof_block_size= sizeof(buf_o) / eof_iter; + const size_t read_size= eof_block_size / read_iter; + size_t total; + + memset(buf_i, 0, sizeof( buf_i)); + memset(buf_o, FILL, sizeof(buf_o)); + + diag("MDEV-17133 Dump thread reads from the past"); + + init_io_cache_encryption(); + + res= open_cached_file(&info, 0, 0, CACHE_SIZE, 0); + ok(res == 0, "open_cached_file" INFO_TAIL); + + res= my_b_write(&info, buf_o, sizeof(buf_o)); + ok(res == 0, "buffer is written" INFO_TAIL); + res= my_b_tell(&info); + ok(res == sizeof(buf_o), "cache size as expected"); + + res= my_b_flush_io_cache(&info, 1); + ok(res == 0, "flush" INFO_TAIL); + res= reinit_io_cache(&info, READ_CACHE, 0, 0, 0); + ok(res == 0, "reinit READ_CACHE" INFO_TAIL); + + // read the written data by chunks of variable size eof_iter times + for (k= eof_iter, info.end_of_file=0, total= 0; k; k--) + { + int i; + size_t curr_read_size; + info.end_of_file= + k == 1 ? sizeof(buf_o) : + MY_MIN(sizeof(buf_o), + info.end_of_file + eof_block_size + + // plus 10% of randomization to the average + (eof_block_size/10 - rand() % (eof_block_size/5))); + + // read a chunk by blocks of variable size read_iter times + // the last block completes the current chunk + for (i= 0; i < read_iter; i++, total += curr_read_size) + { + char buf_check[eof_block_size]; + + curr_read_size= + i == read_iter - 1 ? info.end_of_file - total : + MY_MIN(info.end_of_file - total, + read_size + read_size/10 - rand() % (read_size/5)); + + res= my_b_read(&info, buf_i + total, MY_MIN(19, curr_read_size)); + ok(res == 0, "read of 19"); + // mark read bytes in the used part of the cache buffer + memset(info.buffer, 0, info.read_pos - info.buffer); + + // random size 2nd read + res= my_b_read(&info, buf_i + total + MY_MIN(19, curr_read_size), + 19 >= curr_read_size ? 0 : curr_read_size - 19); + ok(res == 0, "rest of read"); + // mark read bytes in the used part of the cache buffer + memset(info.buffer, 0, info.read_pos - info.buffer); + + // check that no marked bytes are read + memset(buf_check, FILL, curr_read_size); + ok(memcmp(buf_i + total, buf_check, curr_read_size) == 0, + "read correct data"); + } + ok(info.pos_in_file + (info.read_end - info.buffer) == info.end_of_file, + "cache is read up to eof"); + ok(total == info.end_of_file, "total matches eof"); + } + ok(total == sizeof(buf_i), "read total size match"); + ok(buf_i[sizeof(buf_i) - 1] == FILL, "data read correctly"); + + close_cached_file(&info); +} + int main(int argc __attribute__((unused)),char *argv[]) { MY_INIT(argv[0]); - plan(51); + plan(602); /* temp files with and without encryption */ encrypt_tmp_files= 1; @@ -306,6 +386,7 @@ int main(int argc __attribute__((unused)),char *argv[]) encrypt_tmp_files= 0; mdev14014(); + mdev17133(); my_end(0); return exit_status();

1 0

[Commits] 3177d266273: MDEV-13873: galera.galera_suspend_slave failed in buildbot with wrong error code
by jan 19 Sep '18

19 Sep '18

revision-id: 3177d266273b4aa79973c49a519299f54ca097e7 (mariadb-10.1.35-66-g3177d266273) parent(s): 45712a9a1f7b24fab925e85e3df0bc644c8bc0ce author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-19 13:10:54 +0300 message: MDEV-13873: galera.galera_suspend_slave failed in buildbot with wrong error code Add wsrep_sync_wait as we want INSERT to fail. --- mysql-test/suite/galera/r/galera_suspend_slave.result | 2 ++ mysql-test/suite/galera/t/galera_suspend_slave.test | 3 +++ 2 files changed, 5 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_suspend_slave.result b/mysql-test/suite/galera/r/galera_suspend_slave.result index ebddb4c449d..d758b7f4cb1 100644 --- a/mysql-test/suite/galera/r/galera_suspend_slave.result +++ b/mysql-test/suite/galera/r/galera_suspend_slave.result @@ -1,9 +1,11 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; Suspending node_2 ... SET SESSION wsrep_sync_wait = 0; +SET SESSION wsrep_sync_wait = 15; INSERT INTO t1 VALUES (1); Got one of the listed errors Resuming node_2 ... +SET SESSION wsrep_sync_wait = 0; INSERT INTO t1 VALUES (1); SET SESSION wsrep_sync_wait = 0; SELECT COUNT(*) = 1 FROM t1; diff --git a/mysql-test/suite/galera/t/galera_suspend_slave.test b/mysql-test/suite/galera/t/galera_suspend_slave.test index 6f0f8014397..0f95bcd4531 100644 --- a/mysql-test/suite/galera/t/galera_suspend_slave.test +++ b/mysql-test/suite/galera/t/galera_suspend_slave.test @@ -34,6 +34,8 @@ SET SESSION wsrep_sync_wait = 0; --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; --source include/wait_condition.inc +SET SESSION wsrep_sync_wait = 15; + --error ER_UNKNOWN_COM_ERROR,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK,ER_ERROR_DURING_COMMIT INSERT INTO t1 VALUES (1); @@ -46,6 +48,7 @@ INSERT INTO t1 VALUES (1); exit(0); EOF +SET SESSION wsrep_sync_wait = 0; --source include/wait_until_ready.inc INSERT INTO t1 VALUES (1);

1 0

[Commits] 45712a9a1f7: MDEV-13871: galera.galera_unicode_identifiers failed in buildbot with 'Unknown database'
by jan 19 Sep '18

19 Sep '18

revision-id: 45712a9a1f7b24fab925e85e3df0bc644c8bc0ce (mariadb-10.1.35-65-g45712a9a1f7) parent(s): 82524239c48a2603f115a6117e061751f6427d08 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-19 12:19:30 +0300 message: MDEV-13871: galera.galera_unicode_identifiers failed in buildbot with 'Unknown database' Wait in second node until tables with databases are created. --- mysql-test/suite/galera/r/galera_unicode_identifiers.result | 6 +++--- mysql-test/suite/galera/t/galera_unicode_identifiers.test | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_unicode_identifiers.result b/mysql-test/suite/galera/r/galera_unicode_identifiers.result index 9aee4616ec5..28e5ac11086 100644 --- a/mysql-test/suite/galera/r/galera_unicode_identifiers.result +++ b/mysql-test/suite/galera/r/galera_unicode_identifiers.result @@ -6,7 +6,7 @@ CREATE TABLE `table with space` ( `column with space` INTEGER AUTO_INCREMENT PRIMARY KEY, `second column with space` INTEGER, UNIQUE `index name with space` (`second column with space`) -); +) engine=innodb; INSERT INTO `table with space` VALUES (1, 1); CREATE DATABASE `база`; USE `база`; @@ -14,7 +14,7 @@ CREATE TABLE `таблица` ( `първа_колона` INTEGER PRIMARY KEY, `втора_колона` INTEGER, UNIQUE `индекс` (`втора_колона`) -); +) engine=innodb; INSERT INTO `таблица` VALUES (1, 1); CREATE DATABASE `втора база`; USE `втора база`; @@ -22,7 +22,7 @@ CREATE TABLE `втора таблица` ( `първа колона` INTEGER, `втора колона` INTEGER, KEY `първи индекс` (`първа колона`) -); +) engine=innodb; INSERT INTO `втора таблица` VALUES (1, 1); USE `database with space`; SELECT `second column with space` FROM `table with space`; diff --git a/mysql-test/suite/galera/t/galera_unicode_identifiers.test b/mysql-test/suite/galera/t/galera_unicode_identifiers.test index f3df60a6415..c0c95768650 100644 --- a/mysql-test/suite/galera/t/galera_unicode_identifiers.test +++ b/mysql-test/suite/galera/t/galera_unicode_identifiers.test @@ -13,6 +13,8 @@ SET GLOBAL wsrep_sync_wait = 15; --connection node_1 +--let $innodb_num_tables_orig = `SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES` + # Spaces in identifiers CREATE DATABASE `database with space`; @@ -21,7 +23,7 @@ CREATE TABLE `table with space` ( `column with space` INTEGER AUTO_INCREMENT PRIMARY KEY, `second column with space` INTEGER, UNIQUE `index name with space` (`second column with space`) -); +) engine=innodb; INSERT INTO `table with space` VALUES (1, 1); # Unicode identifiers @@ -32,7 +34,7 @@ CREATE TABLE `таблица` ( `първа_колона` INTEGER PRIMARY KEY, `втора_колона` INTEGER, UNIQUE `индекс` (`втора_колона`) -); +) engine=innodb; INSERT INTO `таблица` VALUES (1, 1); @@ -44,11 +46,15 @@ CREATE TABLE `втора таблица` ( `първа колона` INTEGER, `втора колона` INTEGER, KEY `първи индекс` (`първа колона`) -); +) engine=innodb; INSERT INTO `втора таблица` VALUES (1, 1); --connection node_2 +# Wait until 3 above tables with databases are created also to this node +--let $wait_condition = SELECT COUNT(*) = $innodb_num_tables_orig + 3 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES; +--source include/wait_condition.inc + USE `database with space`; SELECT `second column with space` FROM `table with space`;

1 0

[Commits] 82524239c48: MDEV-17208: Test failure on galera.MW-286
by jan 19 Sep '18

19 Sep '18

revision-id: 82524239c48a2603f115a6117e061751f6427d08 (mariadb-10.1.35-64-g82524239c48) parent(s): cd363fecbf0fffe738c9d96cd8751687e5b44d62 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-19 11:42:43 +0300 message: MDEV-17208: Test failure on galera.MW-286 Test changes only. --- mysql-test/suite/galera/r/MW-286.result | 3 +-- mysql-test/suite/galera/t/MW-286.test | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/galera/r/MW-286.result b/mysql-test/suite/galera/r/MW-286.result index adc996c1cbe..e30cf89b84c 100644 --- a/mysql-test/suite/galera/r/MW-286.result +++ b/mysql-test/suite/galera/r/MW-286.result @@ -1,4 +1,4 @@ -CREATE TABLE ten (f1 INTEGER); +CREATE TABLE ten (f1 INTEGER) Engine=InnoDB; INSERT INTO ten VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); CREATE TABLE t1 (f1 INTEGER) Engine=InnoDB; INSERT INTO t1 (f1) SELECT 000000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3.f1) + (10 * a4.f1) + a5.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; @@ -6,7 +6,6 @@ INSERT INTO t1 (f1) SELECT 100000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3 SET GLOBAL wsrep_desync = TRUE; SET wsrep_on = FALSE; ALTER TABLE t1 ADD PRIMARY KEY (f1); -ERROR 70100: Query execution was interrupted SET wsrep_on = TRUE; SET GLOBAL wsrep_desync = FALSE; DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/MW-286.test b/mysql-test/suite/galera/t/MW-286.test index 1b2e322f078..426b4493bb7 100644 --- a/mysql-test/suite/galera/t/MW-286.test +++ b/mysql-test/suite/galera/t/MW-286.test @@ -7,7 +7,7 @@ --source include/big_test.inc --connection node_1 -CREATE TABLE ten (f1 INTEGER); +CREATE TABLE ten (f1 INTEGER) Engine=InnoDB; INSERT INTO ten VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); CREATE TABLE t1 (f1 INTEGER) Engine=InnoDB; @@ -22,11 +22,13 @@ INSERT INTO t1 (f1) SELECT 000000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3 SET GLOBAL wsrep_desync = TRUE; SET wsrep_on = FALSE; ---error ER_QUERY_INTERRUPTED +--error 0,ER_QUERY_INTERRUPTED ALTER TABLE t1 ADD PRIMARY KEY (f1); SET wsrep_on = TRUE; SET GLOBAL wsrep_desync = FALSE; +--connection node_1 +reap; DROP TABLE t1; DROP TABLE ten;

1 0

[Commits] 654b5879994: MDEV-17208: Test failure on galera.MW-286
by jan 19 Sep '18

19 Sep '18

revision-id: 654b587999456e08fdfb3a909bafb19b9fa49830 (mariadb-10.2.16-149-g654b5879994) parent(s): 4a026596f53f59619941c0e3ce5d36a056b6bd2e author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-19 11:33:22 +0300 message: MDEV-17208: Test failure on galera.MW-286 Test changes only. --- mysql-test/suite/galera/r/MW-286.result | 6 ++++-- mysql-test/suite/galera/t/MW-286.test | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/galera/r/MW-286.result b/mysql-test/suite/galera/r/MW-286.result index adc996c1cbe..f3bef6f7516 100644 --- a/mysql-test/suite/galera/r/MW-286.result +++ b/mysql-test/suite/galera/r/MW-286.result @@ -1,13 +1,15 @@ -CREATE TABLE ten (f1 INTEGER); +connection node_1; +CREATE TABLE ten (f1 INTEGER) Engine=InnoDB; INSERT INTO ten VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); CREATE TABLE t1 (f1 INTEGER) Engine=InnoDB; INSERT INTO t1 (f1) SELECT 000000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3.f1) + (10 * a4.f1) + a5.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; INSERT INTO t1 (f1) SELECT 100000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3.f1) + (10 * a4.f1) + a5.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;; +connection node_2; SET GLOBAL wsrep_desync = TRUE; SET wsrep_on = FALSE; ALTER TABLE t1 ADD PRIMARY KEY (f1); -ERROR 70100: Query execution was interrupted SET wsrep_on = TRUE; SET GLOBAL wsrep_desync = FALSE; +connection node_1; DROP TABLE t1; DROP TABLE ten; diff --git a/mysql-test/suite/galera/t/MW-286.test b/mysql-test/suite/galera/t/MW-286.test index 1b2e322f078..426b4493bb7 100644 --- a/mysql-test/suite/galera/t/MW-286.test +++ b/mysql-test/suite/galera/t/MW-286.test @@ -7,7 +7,7 @@ --source include/big_test.inc --connection node_1 -CREATE TABLE ten (f1 INTEGER); +CREATE TABLE ten (f1 INTEGER) Engine=InnoDB; INSERT INTO ten VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); CREATE TABLE t1 (f1 INTEGER) Engine=InnoDB; @@ -22,11 +22,13 @@ INSERT INTO t1 (f1) SELECT 000000 + (10000 * a1.f1) + (1000 * a2.f1) + (100 * a3 SET GLOBAL wsrep_desync = TRUE; SET wsrep_on = FALSE; ---error ER_QUERY_INTERRUPTED +--error 0,ER_QUERY_INTERRUPTED ALTER TABLE t1 ADD PRIMARY KEY (f1); SET wsrep_on = TRUE; SET GLOBAL wsrep_desync = FALSE; +--connection node_1 +reap; DROP TABLE t1; DROP TABLE ten;

1 0

[Commits] cd363fe: Removed duplicate tests.
by IgorBabaev 19 Sep '18

19 Sep '18

revision-id: cd363fecbf0fffe738c9d96cd8751687e5b44d62 (mariadb-10.1.35-63-gcd363fe) parent(s): cc616bea53be7740398aa8b4caf1c19d5f944635 author: Igor Babaev committer: Igor Babaev timestamp: 2018-09-19 01:24:46 -0700 message: Removed duplicate tests. --- mysql-test/r/stat_tables.result | 53 ---------------------------------- mysql-test/r/stat_tables_innodb.result | 53 ---------------------------------- mysql-test/t/stat_tables.test | 45 ----------------------------- 3 files changed, 151 deletions(-) diff --git a/mysql-test/r/stat_tables.result b/mysql-test/r/stat_tables.result index 224c734..40290ca 100644 --- a/mysql-test/r/stat_tables.result +++ b/mysql-test/r/stat_tables.result @@ -591,59 +591,6 @@ id select_type table type possible_keys key key_len ref rows Extra set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity; set use_stat_tables=@save_use_stat_tables; # -# MDEV-16757: manual addition of min/max statistics for BLOB -# -SET use_stat_tables= PREFERABLY; -CREATE TABLE t1 (pk INT PRIMARY KEY, t TEXT); -INSERT INTO t1 VALUES (1,'foo'),(2,'bar'); -ANALYZE TABLE t1; -Table Op Msg_type Msg_text -test.t1 analyze status Engine-independent statistics collected -test.t1 analyze Warning Engine-independent statistics are not collected for column 't' -test.t1 analyze status OK -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -test t1 pk 1 2 0.0000 4.0000 1.0000 0 NULL NULL -DELETE FROM mysql.column_stats -WHERE db_name='test' AND table_name='t1' AND column_name='t'; -INSERT INTO mysql.column_stats VALUES -('test','t1','t','bar','foo', 0.0, 3.0, 1.0, 0, NULL, NULL); -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -test t1 pk 1 2 0.0000 4.0000 1.0000 0 NULL NULL -test t1 t bar foo 0.0000 3.0000 1.0000 0 NULL NULL -SELECT pk FROM t1; -pk -1 -2 -DROP TABLE t1; -set use_stat_tables=@save_use_stat_tables; -# -# MDEV-16760: CREATE OR REPLACE TABLE after ANALYZE TABLE -# -SET use_stat_tables= PREFERABLY; -CREATE TABLE t1 (pk int PRIMARY KEY, c varchar(32)); -INSERT INTO t1 VALUES (1,'foo'),(2,'bar'); -ANALYZE TABLE t1; -Table Op Msg_type Msg_text -test.t1 analyze status Engine-independent statistics collected -test.t1 analyze status OK -SELECT * FROM t1; -pk c -1 foo -2 bar -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -test t1 pk 1 2 0.0000 4.0000 1.0000 0 NULL NULL -test t1 c bar foo 0.0000 3.0000 1.0000 0 NULL NULL -CREATE OR REPLACE TABLE t1 (pk int PRIMARY KEY, a char(7)); -SELECT * FROM t1; -pk a -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -DROP TABLE t1; -set use_stat_tables=@save_use_stat_tables; -# # MDEV-16711:CREATE OR REPLACE TABLE introducing BLOB column # SET use_stat_tables= PREFERABLY; diff --git a/mysql-test/r/stat_tables_innodb.result b/mysql-test/r/stat_tables_innodb.result index ba1dee3..1b1cd7d 100644 --- a/mysql-test/r/stat_tables_innodb.result +++ b/mysql-test/r/stat_tables_innodb.result @@ -618,59 +618,6 @@ id select_type table type possible_keys key key_len ref rows Extra set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity; set use_stat_tables=@save_use_stat_tables; # -# MDEV-16757: manual addition of min/max statistics for BLOB -# -SET use_stat_tables= PREFERABLY; -CREATE TABLE t1 (pk INT PRIMARY KEY, t TEXT); -INSERT INTO t1 VALUES (1,'foo'),(2,'bar'); -ANALYZE TABLE t1; -Table Op Msg_type Msg_text -test.t1 analyze status Engine-independent statistics collected -test.t1 analyze Warning Engine-independent statistics are not collected for column 't' -test.t1 analyze status OK -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -test t1 pk 1 2 0.0000 4.0000 1.0000 0 NULL NULL -DELETE FROM mysql.column_stats -WHERE db_name='test' AND table_name='t1' AND column_name='t'; -INSERT INTO mysql.column_stats VALUES -('test','t1','t','bar','foo', 0.0, 3.0, 1.0, 0, NULL, NULL); -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -test t1 pk 1 2 0.0000 4.0000 1.0000 0 NULL NULL -test t1 t bar foo 0.0000 3.0000 1.0000 0 NULL NULL -SELECT pk FROM t1; -pk -1 -2 -DROP TABLE t1; -set use_stat_tables=@save_use_stat_tables; -# -# MDEV-16760: CREATE OR REPLACE TABLE after ANALYZE TABLE -# -SET use_stat_tables= PREFERABLY; -CREATE TABLE t1 (pk int PRIMARY KEY, c varchar(32)); -INSERT INTO t1 VALUES (1,'foo'),(2,'bar'); -ANALYZE TABLE t1; -Table Op Msg_type Msg_text -test.t1 analyze status Engine-independent statistics collected -test.t1 analyze status OK -SELECT * FROM t1; -pk c -1 foo -2 bar -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -test t1 pk 1 2 0.0000 4.0000 1.0000 0 NULL NULL -test t1 c bar foo 0.0000 3.0000 1.0000 0 NULL NULL -CREATE OR REPLACE TABLE t1 (pk int PRIMARY KEY, a char(7)); -SELECT * FROM t1; -pk a -SELECT * FROM mysql.column_stats; -db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency hist_size hist_type histogram -DROP TABLE t1; -set use_stat_tables=@save_use_stat_tables; -# # MDEV-16711:CREATE OR REPLACE TABLE introducing BLOB column # SET use_stat_tables= PREFERABLY; diff --git a/mysql-test/t/stat_tables.test b/mysql-test/t/stat_tables.test index c318cc5..85a1098 100644 --- a/mysql-test/t/stat_tables.test +++ b/mysql-test/t/stat_tables.test @@ -370,51 +370,6 @@ set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectiv set use_stat_tables=@save_use_stat_tables; --echo # ---echo # MDEV-16757: manual addition of min/max statistics for BLOB ---echo # - -SET use_stat_tables= PREFERABLY; - -CREATE TABLE t1 (pk INT PRIMARY KEY, t TEXT); -INSERT INTO t1 VALUES (1,'foo'),(2,'bar'); -ANALYZE TABLE t1; ---sorted_result -SELECT * FROM mysql.column_stats; -DELETE FROM mysql.column_stats - WHERE db_name='test' AND table_name='t1' AND column_name='t'; -INSERT INTO mysql.column_stats VALUES - ('test','t1','t','bar','foo', 0.0, 3.0, 1.0, 0, NULL, NULL); ---sorted_result -SELECT * FROM mysql.column_stats; - -SELECT pk FROM t1; - -DROP TABLE t1; - -set use_stat_tables=@save_use_stat_tables; - ---echo # ---echo # MDEV-16760: CREATE OR REPLACE TABLE after ANALYZE TABLE ---echo # - -SET use_stat_tables= PREFERABLY; - -CREATE TABLE t1 (pk int PRIMARY KEY, c varchar(32)); -INSERT INTO t1 VALUES (1,'foo'),(2,'bar'); -ANALYZE TABLE t1; -SELECT * FROM t1; -SELECT * FROM mysql.column_stats; - -CREATE OR REPLACE TABLE t1 (pk int PRIMARY KEY, a char(7)); -SELECT * FROM t1; -SELECT * FROM mysql.column_stats; - -DROP TABLE t1; - -set use_stat_tables=@save_use_stat_tables; - - ---echo # --echo # MDEV-16711:CREATE OR REPLACE TABLE introducing BLOB column --echo #

1 0