diff options
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 | ||||
| -rw-r--r-- | mysql-test/r/events_bugs.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/func_misc.result | 13 | ||||
| -rw-r--r-- | mysql-test/r/group_by.result | 16 | ||||
| -rw-r--r-- | mysql-test/t/events_bugs.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/func_misc.test | 15 | ||||
| -rw-r--r-- | mysql-test/t/group_by.test | 14 | ||||
| -rw-r--r-- | sql/item.cc | 40 | ||||
| -rw-r--r-- | sql/item.h | 9 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 2 |
10 files changed, 114 insertions, 7 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 61231628b40..adc693bb29d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5514,12 +5514,12 @@ sub server_need_restart { exists $server->{'restart_opts'}) { my $use_dynamic_option_switch= 0; - delete $server->{'restart_opts'}; + my $restart_opts = delete $server->{'restart_opts'} || []; if (!$use_dynamic_option_switch) { mtr_verbose_restart($server, "running with different options '" . join(" ", @{$extra_opts}) . "' != '" . - join(" ", @{$started_opts}) . "'" ); + join(" ", @{$started_opts}, @{$restart_opts}) . "'" ); return 1; } diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index cb8850112a5..4870c464fff 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -692,7 +692,7 @@ SET GLOBAL READ_ONLY = 1; connect u1_con,localhost,mysqltest_u1,,events_test; -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement ALTER EVENT e1 COMMENT 'comment'; @@ -703,7 +703,7 @@ ERROR HY000: The MariaDB server is running with the --read-only option so it can connect root_con,localhost,root,,events_test; -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; Warnings: Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it. diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index a19676168c2..b7d124e5686 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -1491,6 +1491,19 @@ x x DEALLOCATE PREPARE stmt; # +# MDEV-19680: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index) || +# (!(ptr >= table->record[0] && ptr < table->record[0] + table->s->reclength)))' +# or alike failed upon SELECT with mix of functions from simple view +# +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); +CREATE VIEW v1 AS SELECT * FROM t1; +SELECT ISNULL( BENCHMARK(1, MIN(a))) FROM v1; +ISNULL( BENCHMARK(1, MIN(a))) +0 +DROP VIEW v1; +DROP TABLE t1; +# # Start of 10.2 tests # # diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index aaf0a3e5288..23091d4647c 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -2827,6 +2827,22 @@ SELECT 1 IN ( SELECT COUNT( DISTINCT f2 ) FROM t1 WHERE f1 <= 4 ); 0 drop table t1; # +# MDEV-20922: Adding an order by changes the query results +# +CREATE TABLE t1(a int, b int); +INSERT INTO t1 values (1, 100), (2, 200), (3, 100), (4, 200); +create view v1 as select a, b+1 as x from t1; +SELECT x, COUNT(DISTINCT a) AS y FROM v1 GROUP BY x ORDER BY y; +x y +101 2 +201 2 +SELECT b+1 AS x, COUNT(DISTINCT a) AS y FROM t1 GROUP BY x ORDER BY y; +x y +101 2 +201 2 +drop view v1; +drop table t1; +# # MDEV-10694 - SIGFPE and/or huge memory allocation in maria_create with distinct/group by/ rollup # create table t1 (a int,b int) ; diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test index a0f3c5991ef..ab45446667e 100644 --- a/mysql-test/t/events_bugs.test +++ b/mysql-test/t/events_bugs.test @@ -1029,7 +1029,7 @@ SET GLOBAL READ_ONLY = 1; --echo --error ER_OPTION_PREVENTS_STATEMENT -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; --echo @@ -1049,7 +1049,7 @@ DROP EVENT e1; --echo -CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; +CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; --echo diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index cdbbe708153..75ff47aa24c 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -1139,6 +1139,21 @@ PREPARE stmt FROM "SELECT 'x' ORDER BY NAME_CONST( 'f', 'foo' )"; EXECUTE stmt; DEALLOCATE PREPARE stmt; +--echo # +--echo # MDEV-19680: Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index) || +--echo # (!(ptr >= table->record[0] && ptr < table->record[0] + table->s->reclength)))' +--echo # or alike failed upon SELECT with mix of functions from simple view +--echo # + +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); +CREATE VIEW v1 AS SELECT * FROM t1; + +SELECT ISNULL( BENCHMARK(1, MIN(a))) FROM v1; + +DROP VIEW v1; +DROP TABLE t1; + --echo # --echo # Start of 10.2 tests diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index 78a319f8f84..9e24238b301 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -1946,6 +1946,20 @@ SELECT 1 IN ( SELECT COUNT( DISTINCT f2 ) FROM t1 WHERE f1 <= 4 ); drop table t1; --echo # +--echo # MDEV-20922: Adding an order by changes the query results +--echo # + +CREATE TABLE t1(a int, b int); +INSERT INTO t1 values (1, 100), (2, 200), (3, 100), (4, 200); + +create view v1 as select a, b+1 as x from t1; + +SELECT x, COUNT(DISTINCT a) AS y FROM v1 GROUP BY x ORDER BY y; +SELECT b+1 AS x, COUNT(DISTINCT a) AS y FROM t1 GROUP BY x ORDER BY y; + +drop view v1; +drop table t1; +--echo # --echo # MDEV-10694 - SIGFPE and/or huge memory allocation in maria_create with distinct/group by/ rollup --echo # create table t1 (a int,b int) ; diff --git a/sql/item.cc b/sql/item.cc index 2577bbed716..4f8433c28c0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8876,6 +8876,46 @@ bool Item_direct_view_ref::excl_dep_on_grouping_fields(st_select_lex *sel) } +double Item_direct_view_ref::val_result() +{ + double tmp=(*ref)->val_result(); + null_value=(*ref)->null_value; + return tmp; +} + + +longlong Item_direct_view_ref::val_int_result() +{ + longlong tmp=(*ref)->val_int_result(); + null_value=(*ref)->null_value; + return tmp; +} + + +String *Item_direct_view_ref::str_result(String* tmp) +{ + tmp=(*ref)->str_result(tmp); + null_value=(*ref)->null_value; + return tmp; +} + + +my_decimal *Item_direct_view_ref::val_decimal_result(my_decimal *val) +{ + my_decimal *tmp= (*ref)->val_decimal_result(val); + null_value=(*ref)->null_value; + return tmp; +} + + +bool Item_direct_view_ref::val_bool_result() +{ + bool tmp= (*ref)->val_bool_result(); + null_value=(*ref)->null_value; + return tmp; +} + + bool Item_default_value::eq(const Item *item, bool binary_cmp) const { return item->type() == DEFAULT_VALUE_ITEM && diff --git a/sql/item.h b/sql/item.h index c3db959fd44..4f02b2085f4 100644 --- a/sql/item.h +++ b/sql/item.h @@ -4978,6 +4978,15 @@ public: item_equal= NULL; Item_direct_ref::cleanup(); } + /* + TODO move these val_*_result function to Item_dierct_ref (maybe) + */ + double val_result(); + longlong val_int_result(); + String *str_result(String* tmp); + my_decimal *val_decimal_result(my_decimal *val); + bool val_bool_result(); + Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_direct_view_ref>(thd, mem_root, this); } }; diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index a6bc4e171da..f8fbf12effe 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -4249,7 +4249,7 @@ void SELECT_LEX::update_used_tables() } Item *item; - List_iterator_fast<Item> it(join->fields_list); + List_iterator_fast<Item> it(join->all_fields); select_list_tables= 0; while ((item= it++)) { |