Skip to content

M
MariaDB
Commit ab476a8d authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

Merge branch '5.5' into 10.0

parents f91798dd 43a50909
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 382 additions and 194 deletions
mysql-test/include/default_mysqld.cnf
View file @ ab476a8d
...@@ -39,6 +39,9 @@ max_heap_table_size= 1M ...@@ -39,6 +39,9 @@ max_heap_table_size= 1M
loose-aria-pagecache-buffer-size=8M loose-aria-pagecache-buffer-size=8M
loose-feedback-user-info= mysql-test loose-feedback-user-info= mysql-test
loose-feedback-debug-startup-interval=20
loose-feedback-debug-first-interval=60
loose-feedback-debug-interval=60
loose-innodb_data_file_path= ibdata1:12M:autoextend loose-innodb_data_file_path= ibdata1:12M:autoextend
loose-innodb_buffer_pool_size= 8M loose-innodb_buffer_pool_size= 8M
......
mysql-test/r/update.result
View file @ ab476a8d
...@@ -619,31 +619,29 @@ Handler_update 5 ...@@ -619,31 +619,29 @@ Handler_update 5
ROLLBACK; ROLLBACK;
DROP TABLE t1, t2; DROP TABLE t1, t2;
# #
# MDEV-4410: update does not want to use a covering index, but select uses it. # MDEV-8938: Server Crash on Update with joins
# #
create table t2(a int); CREATE TABLE `t1` (
insert into t2 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); `name` varchar(255) NOT NULL,
create table t1 (key1 int, col1 int, key(key1)); `value` varchar(4095) DEFAULT NULL,
insert into t1 PRIMARY KEY (`name`)
select A.a + 10 * B.a + 100 * C.a, 1234 from t2 A, t2 B, t2 C; );
# This must not have "Using filesort": UPDATE `t1` SET value = CONCAT("*.",(SELECT `temptable`.`value` FROM (SELECT * FROM `t1` WHERE `name`="consoleproxy.url.domain") AS `temptable` WHERE `temptable`.`name`="consoleproxy.url.domain")) WHERE `name`="consoleproxy.url.domain";
explain drop table t1;
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2; CREATE TABLE `t1` (
id select_type table type possible_keys key key_len ref rows Extra `name` varchar(255) NOT NULL,
1 SIMPLE t1 range key1 key1 5 NULL 2 Using where; Using buffer `value` varchar(4095) DEFAULT NULL,
flush status; PRIMARY KEY (`name`)
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2; );
show status like 'Handler_read%'; create table t2 (
Variable_name Value `name` varchar(255) NOT NULL,
Handler_read_first 0 `value` varchar(4095) DEFAULT NULL,
Handler_read_key 1 PRIMARY KEY (`name`)
Handler_read_last 0 );
Handler_read_next 1 UPDATE t1
Handler_read_prev 0 SET value = (SELECT value FROM t2 WHERE `name`= t1.name)
Handler_read_rnd 2 WHERE value is null ;
Handler_read_rnd_deleted 0 drop table t1,t2;
Handler_read_rnd_next 0
drop table t1, t2;
# #
#MDEV-8701: Crash on derived query #MDEV-8701: Crash on derived query
# #
...@@ -679,4 +677,30 @@ WHERE data_entry_exit_id = t2.data_entry_id ...@@ -679,4 +677,30 @@ WHERE data_entry_exit_id = t2.data_entry_id
); );
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
#
# MDEV-4410: update does not want to use a covering index, but select uses it.
#
create table t2(a int);
insert into t2 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t1 (key1 int, col1 int, key(key1));
insert into t1
select A.a + 10 * B.a + 100 * C.a, 1234 from t2 A, t2 B, t2 C;
# This must not have "Using filesort":
explain
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range key1 key1 5 NULL 2 Using where; Using buffer
flush status;
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2;
show status like 'Handler_read%';
Variable_name Value
Handler_read_first 0
Handler_read_key 1
Handler_read_last 0
Handler_read_next 1
Handler_read_prev 0
Handler_read_rnd 2
Handler_read_rnd_deleted 0
Handler_read_rnd_next 0
drop table t1, t2;
# End of MariaDB 10.0 tests # End of MariaDB 10.0 tests
mysql-test/r/view.result
View file @ ab476a8d
...@@ -5477,6 +5477,39 @@ UPDATE t1, t2 SET a = 1 WHERE a IN ( SELECT 0 FROM v3 ); ...@@ -5477,6 +5477,39 @@ UPDATE t1, t2 SET a = 1 WHERE a IN ( SELECT 0 FROM v3 );
EXECUTE stmt; EXECUTE stmt;
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
DROP VIEW v3; DROP VIEW v3;
#
# MDEV-8632: Segmentation fault on INSERT
#
CREATE TABLE `t1` (
`id` int(10) unsigned NOT NULL,
`r` float NOT NULL,
PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
create view v1 as select id, if(r=r,1,2) as d from t1;
create view v2 as
select id,
d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d as p
from v1;
insert into t1 (id, r)
select id,p from
(
select id,
d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d as p
from (
select id, if(r=r,1,2) as d
from t1
) a
) b
on duplicate key update r=p;
insert into t1 (id, r)
select id,p from v2
on duplicate key update r=p;
prepare stmt from "insert into t1 (id, r) select id,p from v2 on duplicate key update r=p";
execute stmt;
execute stmt;
deallocate prepare stmt;
drop view v1,v2;
drop table `t1`;
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# -- End of 5.5 tests. # -- End of 5.5 tests.
# ----------------------------------------------------------------- # -----------------------------------------------------------------
......
mysql-test/suite/innodb/r/innodb-fk-warnings.result
View file @ ab476a8d
...@@ -25,7 +25,7 @@ create table t2(a int, constraint a foreign key a (a) references t1(a)) engine=i ...@@ -25,7 +25,7 @@ create table t2(a int, constraint a foreign key a (a) references t1(a)) engine=i
ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Create table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns. Error close to foreign key a (a) references t1(a)) engine=innodb. Warning 150 Create table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near ' foreign key a (a) references t1(a)) engine=innodb'.
Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
drop table t1; drop table t1;
...@@ -42,7 +42,7 @@ alter table t2 add constraint b foreign key (b) references t2(b); ...@@ -42,7 +42,7 @@ alter table t2 add constraint b foreign key (b) references t2(b);
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Alter table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns. Error close to foreign key (b) references t2(b). Warning 150 Alter table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near ' foreign key (b) references t2(b)'.
Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
drop table t2, t1; drop table t2, t1;
...@@ -51,7 +51,7 @@ alter table t1 add constraint c1 foreign key (f1) references t11(f1); ...@@ -51,7 +51,7 @@ alter table t1 add constraint c1 foreign key (f1) references t11(f1);
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Alter table `test`.`t1` with foreign key constraint failed. Referenced table `test`.`t11` not found in the data dictionary close to foreign key (f1) references t11(f1). Warning 150 Alter table `test`.`t1` with foreign key constraint failed. Referenced table `test`.`t11` not found in the data dictionary near ' foreign key (f1) references t11(f1)'.
Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
drop table t1; drop table t1;
...@@ -90,14 +90,14 @@ alter table t1 add constraint c1 foreign key (f1) references t1(f1) on update se ...@@ -90,14 +90,14 @@ alter table t1 add constraint c1 foreign key (f1) references t1(f1) on update se
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Alter table `test`.`t1` with foreign key constraint failed. You have defined a SET NULL condition but column f1 is defined as NOT NULL in foreign key (f1) references t1(f1) on update set null close to on update set null. Warning 150 Alter table `test`.`t1` with foreign key constraint failed. You have defined a SET NULL condition but column 'f1' is defined as NOT NULL in ' foreign key (f1) references t1(f1) on update set null' near ' on update set null'.
Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
create table t2(a int not null, foreign key(a) references t1(f1) on delete set null) engine=innodb; create table t2(a int not null, foreign key(a) references t1(f1) on delete set null) engine=innodb;
ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Create table `test`.`t2` with foreign key constraint failed. You have defined a SET NULL condition but column a is defined as NOT NULL in foreign key(a) references t1(f1) on delete set null) engine=innodb close to on delete set null) engine=innodb. Warning 150 Create table `test`.`t2` with foreign key constraint failed. You have defined a SET NULL condition but column 'a' is defined as NOT NULL in 'foreign key(a) references t1(f1) on delete set null) engine=innodb' near ' on delete set null) engine=innodb'.
Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
drop table t1; drop table t1;
...@@ -106,7 +106,7 @@ create table t2(a char(20), key(a), foreign key(a) references t1(f1)) engine=inn ...@@ -106,7 +106,7 @@ create table t2(a char(20), key(a), foreign key(a) references t1(f1)) engine=inn
ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Create table `test`.`t2` with foreign key constraint failed. Field type or character set for column a does not mach referenced column f1 close to foreign key(a) references t1(f1)) engine=innodb Warning 150 Create table `test`.`t2` with foreign key constraint failed. Field type or character set for column 'a' does not mach referenced column 'f1' near 'foreign key(a) references t1(f1)) engine=innodb'.
Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
drop table t1; drop table t1;
mysql-test/suite/innodb/r/innodb-fk.result
View file @ ab476a8d
...@@ -50,8 +50,8 @@ CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE ...@@ -50,8 +50,8 @@ CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE
ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Create table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary close to FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE Warning 150 Create table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary near ' FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE
) ENGINE=InnoDB. ) ENGINE=InnoDB'.
Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
CREATE TABLE t2 ( CREATE TABLE t2 (
...@@ -65,7 +65,7 @@ ALTER TABLE t2 ADD CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE ...@@ -65,7 +65,7 @@ ALTER TABLE t2 ADD CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
show warnings; show warnings;
Level Code Message Level Code Message
Warning 150 Alter table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary close to FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE. Warning 150 Alter table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary near ' FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE'.
Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed") Error 1005 Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
Warning 1215 Cannot add foreign key constraint Warning 1215 Cannot add foreign key constraint
drop table t2; drop table t2;
......
mysql-test/suite/plugins/r/feedback_plugin_install.result
View file @ ab476a8d
...@@ -3,7 +3,8 @@ select plugin_status from information_schema.plugins where plugin_name='feedback ...@@ -3,7 +3,8 @@ select plugin_status from information_schema.plugins where plugin_name='feedback
plugin_status plugin_status
ACTIVE ACTIVE
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid'; and variable_name not like '%_uid'
and variable_name not like '%debug%';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
FEEDBACK used 1 FEEDBACK used 1
FEEDBACK version 1.1 FEEDBACK version 1.1
......
mysql-test/suite/plugins/r/feedback_plugin_load.result
View file @ ab476a8d
...@@ -6,7 +6,8 @@ SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback wher ...@@ -6,7 +6,8 @@ SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback wher
variable_value = @feedback_used + 1 variable_value = @feedback_used + 1
1 1
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid' and variable_name not like 'FEEDBACK used'; and variable_name not like '%_uid' and variable_name not like 'FEEDBACK used'
and variable_name not like '%debug%';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
FEEDBACK version 1.1 FEEDBACK version 1.1
FEEDBACK_SEND_RETRY_WAIT 60 FEEDBACK_SEND_RETRY_WAIT 60
......
mysql-test/suite/plugins/r/feedback_plugin_send.result
View file @ ab476a8d
...@@ -6,7 +6,8 @@ SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback wher ...@@ -6,7 +6,8 @@ SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback wher
variable_value = @feedback_used + 1 variable_value = @feedback_used + 1
1 1
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid' and variable_name not like 'FEEDBACK used'; and variable_name not like '%_uid' and variable_name not like 'FEEDBACK used'
and variable_name not like '%debug%';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
FEEDBACK version 1.1 FEEDBACK version 1.1
FEEDBACK_SEND_RETRY_WAIT 60 FEEDBACK_SEND_RETRY_WAIT 60
...@@ -22,7 +23,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME ...@@ -22,7 +23,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used latin1_swedish_ci 1 Collation used latin1_swedish_ci
1 Collation used utf8_bin 1 Collation used utf8_bin
1 Collation used utf8_general_ci 1 Collation used utf8_general_ci
feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent set global sql_mode=ONLY_FULL_GROUP_BY;
feedback plugin: server replied 'ok' 6: feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent
feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent 6: feedback plugin: server replied 'ok'
feedback plugin: server replied 'ok'
mysql-test/suite/plugins/t/feedback_plugin_install.test
View file @ ab476a8d
...@@ -10,6 +10,8 @@ select plugin_status from information_schema.plugins where plugin_name='feedback ...@@ -10,6 +10,8 @@ select plugin_status from information_schema.plugins where plugin_name='feedback
--replace_result https http --replace_result https http
--sorted_result --sorted_result
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid'; and variable_name not like '%_uid'
and variable_name not like '%debug%';
uninstall plugin feedback; uninstall plugin feedback;
mysql-test/suite/plugins/t/feedback_plugin_load.test
View file @ ab476a8d
...@@ -24,7 +24,8 @@ SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback wher ...@@ -24,7 +24,8 @@ SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback wher
--replace_result https http --replace_result https http
--sorted_result --sorted_result
select * from information_schema.feedback where variable_name like 'feed%' select * from information_schema.feedback where variable_name like 'feed%'
and variable_name not like '%_uid' and variable_name not like 'FEEDBACK used'; and variable_name not like '%_uid' and variable_name not like 'FEEDBACK used'
and variable_name not like '%debug%';
# Embedded server does not use the table mysqld.user and thus # Embedded server does not use the table mysqld.user and thus
# does not automatically use latin1_bin on startup. Use it manually. # does not automatically use latin1_bin on startup. Use it manually.
......
mysql-test/suite/plugins/t/feedback_plugin_send.test
View file @ ab476a8d
...@@ -13,7 +13,11 @@ if (!$MTR_FEEDBACK_PLUGIN) { ...@@ -13,7 +13,11 @@ if (!$MTR_FEEDBACK_PLUGIN) {
# Let's wait, and hope that mtr is started with --parallel and # Let's wait, and hope that mtr is started with --parallel and
# is doing some work in other workers. # is doing some work in other workers.
# #
sleep 310;
sleep 100;
set global sql_mode=ONLY_FULL_GROUP_BY;
sleep 210;
# The test expects that the plugin will send a report at least 2 times, # The test expects that the plugin will send a report at least 2 times,
# now (5 min after loading) and on server shutdown which happens below. # now (5 min after loading) and on server shutdown which happens below.
...@@ -25,20 +29,15 @@ sleep 310; ...@@ -25,20 +29,15 @@ sleep 310;
--let $shutdown_timeout= 60 --let $shutdown_timeout= 60
source include/restart_mysqld.inc; source include/restart_mysqld.inc;
replace_result https http; replace_result https http 2 6;
perl; perl;
$log_error= $ENV{'MYSQLTEST_VARDIR'} . '/log/mysqld.1.err'; $log_error= $ENV{'MYSQLTEST_VARDIR'} . '/log/mysqld.1.err';
open(LOG, '<', $log_error) or die "open(< $log_error): $!"; open(LOG, '<', $log_error) or die "open(< $log_error): $!";
# Get the first few rows (as there may be different number rows in the log) %logg=();
$i= 0; while ($_=<LOG>) {
while ($_=<LOG>) $logg{$&}++ if /feedback plugin:.*/;
{
if (/feedback plugin:.*/)
{
print "$&\n";
break if ($i++ >= 3);
}
} }
print "$logg{$_}: $_\n" for sort keys %logg;
close LOG; close LOG;
EOF EOF
mysql-test/t/update.test
View file @ ab476a8d
...@@ -560,25 +560,36 @@ ROLLBACK; ...@@ -560,25 +560,36 @@ ROLLBACK;
DROP TABLE t1, t2; DROP TABLE t1, t2;
--echo # --echo #
--echo # MDEV-4410: update does not want to use a covering index, but select uses it. --echo # MDEV-8938: Server Crash on Update with joins
--echo # --echo #
create table t2(a int);
insert into t2 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t1 (key1 int, col1 int, key(key1)); CREATE TABLE `t1` (
insert into t1 `name` varchar(255) NOT NULL,
select A.a + 10 * B.a + 100 * C.a, 1234 from t2 A, t2 B, t2 C; `value` varchar(4095) DEFAULT NULL,
PRIMARY KEY (`name`)
);
--echo # This must not have "Using filesort": UPDATE `t1` SET value = CONCAT("*.",(SELECT `temptable`.`value` FROM (SELECT * FROM `t1` WHERE `name`="consoleproxy.url.domain") AS `temptable` WHERE `temptable`.`name`="consoleproxy.url.domain")) WHERE `name`="consoleproxy.url.domain";
explain
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2;
flush status; drop table t1;
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2;
# Handler_read_next should be 1 (due to LIMIT), not 100:
show status like 'Handler_read%';
drop table t1, t2; CREATE TABLE `t1` (
`name` varchar(255) NOT NULL,
`value` varchar(4095) DEFAULT NULL,
PRIMARY KEY (`name`)
);
create table t2 (
`name` varchar(255) NOT NULL,
`value` varchar(4095) DEFAULT NULL,
PRIMARY KEY (`name`)
);
UPDATE t1
SET value = (SELECT value FROM t2 WHERE `name`= t1.name)
WHERE value is null ;
drop table t1,t2;
--echo # --echo #
--echo #MDEV-8701: Crash on derived query --echo #MDEV-8701: Crash on derived query
...@@ -621,4 +632,25 @@ SET data_entry_cost ...@@ -621,4 +632,25 @@ SET data_entry_cost
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
--echo #
--echo # MDEV-4410: update does not want to use a covering index, but select uses it.
--echo #
create table t2(a int);
insert into t2 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t1 (key1 int, col1 int, key(key1));
insert into t1
select A.a + 10 * B.a + 100 * C.a, 1234 from t2 A, t2 B, t2 C;
--echo # This must not have "Using filesort":
explain
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2;
flush status;
update t1 set key1=key1+1 where key1 between 10 and 110 order by key1 limit 2;
# Handler_read_next should be 1 (due to LIMIT), not 100:
show status like 'Handler_read%';
drop table t1, t2;
--echo # End of MariaDB 10.0 tests --echo # End of MariaDB 10.0 tests
mysql-test/t/view.test
View file @ ab476a8d
...@@ -5445,6 +5445,41 @@ EXECUTE stmt; ...@@ -5445,6 +5445,41 @@ EXECUTE stmt;
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
DROP VIEW v3; DROP VIEW v3;
--echo #
--echo # MDEV-8632: Segmentation fault on INSERT
--echo #
CREATE TABLE `t1` (
`id` int(10) unsigned NOT NULL,
`r` float NOT NULL,
PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
create view v1 as select id, if(r=r,1,2) as d from t1;
create view v2 as
select id,
d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d as p
from v1;
insert into t1 (id, r)
select id,p from
(
select id,
d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d+d as p
from (
select id, if(r=r,1,2) as d
from t1
) a
) b
on duplicate key update r=p;
insert into t1 (id, r)
select id,p from v2
on duplicate key update r=p;
prepare stmt from "insert into t1 (id, r) select id,p from v2 on duplicate key update r=p";
execute stmt;
execute stmt;
deallocate prepare stmt;
drop view v1,v2;
drop table `t1`;
--echo # ----------------------------------------------------------------- --echo # -----------------------------------------------------------------
--echo # -- End of 5.5 tests. --echo # -- End of 5.5 tests.
--echo # ----------------------------------------------------------------- --echo # -----------------------------------------------------------------
......
plugin/feedback/feedback.cc
View file @ ab476a8d
...@@ -22,6 +22,10 @@ extern ST_SCHEMA_TABLE schema_tables[]; ...@@ -22,6 +22,10 @@ extern ST_SCHEMA_TABLE schema_tables[];
namespace feedback { namespace feedback {
#ifndef DBUG_OFF
ulong debug_startup_interval, debug_first_interval, debug_interval;
#endif
char server_uid_buf[SERVER_UID_SIZE+1]; ///< server uid will be written here char server_uid_buf[SERVER_UID_SIZE+1]; ///< server uid will be written here
/* backing store for system variables */ /* backing store for system variables */
...@@ -250,6 +254,18 @@ static int init(void *p) ...@@ -250,6 +254,18 @@ static int init(void *p)
prepare_linux_info(); prepare_linux_info();
#ifndef DBUG_OFF
if (startup_interval != debug_startup_interval ||
first_interval != debug_first_interval ||
interval != debug_interval)
{
startup_interval= debug_startup_interval;
first_interval= debug_first_interval;
interval= debug_interval;
user_info= "mysql-test";
}
#endif
url_count= 0; url_count= 0;
if (*url) if (*url)
{ {
...@@ -348,12 +364,29 @@ static MYSQL_SYSVAR_ULONG(send_retry_wait, send_retry_wait, PLUGIN_VAR_RQCMDARG, ...@@ -348,12 +364,29 @@ static MYSQL_SYSVAR_ULONG(send_retry_wait, send_retry_wait, PLUGIN_VAR_RQCMDARG,
"Wait this many seconds before retrying a failed send.", "Wait this many seconds before retrying a failed send.",
NULL, NULL, 60, 1, 60*60*24, 1); NULL, NULL, 60, 1, 60*60*24, 1);
#ifndef DBUG_OFF
static MYSQL_SYSVAR_ULONG(debug_startup_interval, debug_startup_interval,
PLUGIN_VAR_RQCMDARG, "for debugging only",
NULL, NULL, startup_interval, 1, INT_MAX32, 1);
static MYSQL_SYSVAR_ULONG(debug_first_interval, debug_first_interval,
PLUGIN_VAR_RQCMDARG, "for debugging only",
NULL, NULL, first_interval, 1, INT_MAX32, 1);
static MYSQL_SYSVAR_ULONG(debug_interval, debug_interval,
PLUGIN_VAR_RQCMDARG, "for debugging only",
NULL, NULL, interval, 1, INT_MAX32, 1);
#endif
static struct st_mysql_sys_var* settings[] = { static struct st_mysql_sys_var* settings[] = {
MYSQL_SYSVAR(server_uid), MYSQL_SYSVAR(server_uid),
MYSQL_SYSVAR(user_info), MYSQL_SYSVAR(user_info),
MYSQL_SYSVAR(url), MYSQL_SYSVAR(url),
MYSQL_SYSVAR(send_timeout), MYSQL_SYSVAR(send_timeout),
MYSQL_SYSVAR(send_retry_wait), MYSQL_SYSVAR(send_retry_wait),
#ifndef DBUG_OFF
MYSQL_SYSVAR(debug_startup_interval),
MYSQL_SYSVAR(debug_first_interval),
MYSQL_SYSVAR(debug_interval),
#endif
NULL NULL
}; };
......
plugin/feedback/feedback.h
View file @ ab476a8d
...@@ -59,6 +59,10 @@ class Url { ...@@ -59,6 +59,10 @@ class Url {
extern Url **urls; extern Url **urls;
extern uint url_count; extern uint url_count;
extern time_t startup_interval;
extern time_t first_interval;
extern time_t interval;
/* these are used to communicate with the background thread */ /* these are used to communicate with the background thread */
extern mysql_mutex_t sleep_mutex; extern mysql_mutex_t sleep_mutex;
extern mysql_cond_t sleep_condition; extern mysql_cond_t sleep_condition;
......
plugin/feedback/sender_thread.cc
View file @ ab476a8d
...@@ -25,9 +25,9 @@ static my_thread_id thd_thread_id; ///< its thread_id ...@@ -25,9 +25,9 @@ static my_thread_id thd_thread_id; ///< its thread_id
static size_t needed_size= 20480; static size_t needed_size= 20480;
static const time_t startup_interval= 60*5; ///< in seconds (5 minutes) time_t startup_interval= 60*5; ///< in seconds (5 minutes)
static const time_t first_interval= 60*60*24; ///< in seconds (one day) time_t first_interval= 60*60*24; ///< in seconds (one day)
static const time_t interval= 60*60*24*7; ///< in seconds (one week) time_t interval= 60*60*24*7; ///< in seconds (one week)
/** /**
reads the rows from a table and puts them, concatenated, in a String reads the rows from a table and puts them, concatenated, in a String
...@@ -124,6 +124,7 @@ static int prepare_for_fill(TABLE_LIST *tables) ...@@ -124,6 +124,7 @@ static int prepare_for_fill(TABLE_LIST *tables)
if (!tables->table) if (!tables->table)
return 1; return 1;
tables->select_lex= thd->lex->current_select;
tables->table->pos_in_table_list= tables; tables->table->pos_in_table_list= tables;
return 0; return 0;
......
sql/item.cc
View file @ ab476a8d
...@@ -1884,6 +1884,8 @@ void Item::split_sum_func2(THD *thd, Item **ref_pointer_array, ...@@ -1884,6 +1884,8 @@ void Item::split_sum_func2(THD *thd, Item **ref_pointer_array,
*/ */
Item_aggregate_ref *item_ref; Item_aggregate_ref *item_ref;
uint el= fields.elements; uint el= fields.elements;
DBUG_ASSERT(fields.elements <=
thd->lex->current_select->ref_pointer_array_size);
/* /*
If this is an item_ref, get the original item If this is an item_ref, get the original item
This is a safety measure if this is called for things that is This is a safety measure if this is called for things that is
...@@ -6716,6 +6718,7 @@ Item *Item_field::update_value_transformer(uchar *select_arg) ...@@ -6716,6 +6718,7 @@ Item *Item_field::update_value_transformer(uchar *select_arg)
{ {
List<Item> *all_fields= &select->join->all_fields; List<Item> *all_fields= &select->join->all_fields;
Item **ref_pointer_array= select->ref_pointer_array; Item **ref_pointer_array= select->ref_pointer_array;
DBUG_ASSERT(all_fields->elements <= select->ref_pointer_array_size);
int el= all_fields->elements; int el= all_fields->elements;
Item_ref *ref; Item_ref *ref;
......
sql/sql_select.cc
View file @ ab476a8d
...@@ -481,6 +481,7 @@ fix_inner_refs(THD *thd, List<Item> &all_fields, SELECT_LEX *select, ...@@ -481,6 +481,7 @@ fix_inner_refs(THD *thd, List<Item> &all_fields, SELECT_LEX *select,
if (ref_pointer_array && !ref->found_in_select_list) if (ref_pointer_array && !ref->found_in_select_list)
{ {
int el= all_fields.elements; int el= all_fields.elements;
DBUG_ASSERT(all_fields.elements <= select->ref_pointer_array_size);
ref_pointer_array[el]= item; ref_pointer_array[el]= item;
/* Add the field item to the select list of the current select. */ /* Add the field item to the select list of the current select. */
all_fields.push_front(item); all_fields.push_front(item);
...@@ -895,6 +896,7 @@ JOIN::prepare(Item ***rref_pointer_array, ...@@ -895,6 +896,7 @@ JOIN::prepare(Item ***rref_pointer_array,
{ {
Item_field *field= new Item_field(thd, *(Item_field**)ord->item); Item_field *field= new Item_field(thd, *(Item_field**)ord->item);
int el= all_fields.elements; int el= all_fields.elements;
DBUG_ASSERT(all_fields.elements <= select_lex->ref_pointer_array_size);
ref_pointer_array[el]= field; ref_pointer_array[el]= field;
all_fields.push_front(field); all_fields.push_front(field);
ord->item= ref_pointer_array + el; ord->item= ref_pointer_array + el;
...@@ -21443,6 +21445,8 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, ...@@ -21443,6 +21445,8 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
return TRUE; /* Wrong field. */ return TRUE; /* Wrong field. */
uint el= all_fields.elements; uint el= all_fields.elements;
DBUG_ASSERT(all_fields.elements <=
thd->lex->current_select->ref_pointer_array_size);
all_fields.push_front(order_item); /* Add new field to field list. */ all_fields.push_front(order_item); /* Add new field to field list. */
ref_pointer_array[el]= order_item; ref_pointer_array[el]= order_item;
/* /*
...@@ -21702,6 +21706,8 @@ create_distinct_group(THD *thd, Item **ref_pointer_array, ...@@ -21702,6 +21706,8 @@ create_distinct_group(THD *thd, Item **ref_pointer_array,
*/ */
Item_field *new_item= new Item_field(thd, (Item_field*)item); Item_field *new_item= new Item_field(thd, (Item_field*)item);
int el= all_fields.elements; int el= all_fields.elements;
DBUG_ASSERT(all_fields.elements <=
thd->lex->current_select->ref_pointer_array_size);
orig_ref_pointer_array[el]= new_item; orig_ref_pointer_array[el]= new_item;
all_fields.push_front(new_item); all_fields.push_front(new_item);
ord->item= orig_ref_pointer_array + el; ord->item= orig_ref_pointer_array + el;
......
sql/sql_view.cc
View file @ ab476a8d
...@@ -1493,6 +1493,11 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, ...@@ -1493,6 +1493,11 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
*/ */
lex->sql_command= old_lex->sql_command; lex->sql_command= old_lex->sql_command;
lex->duplicates= old_lex->duplicates; lex->duplicates= old_lex->duplicates;
/* Fields in this view can be used in upper select in case of merge. */
if (table->select_lex)
table->select_lex->select_n_where_fields+=
lex->select_lex.select_n_where_fields;
} }
/* /*
This method has a dependency on the proper lock type being set, This method has a dependency on the proper lock type being set,
......
sql/sql_yacc.yy
View file @ ab476a8d
...@@ -10763,6 +10763,15 @@ table_factor: ...@@ -10763,6 +10763,15 @@ table_factor:
sel->add_joined_table($$); sel->add_joined_table($$);
lex->pop_context(); lex->pop_context();
lex->nest_level--; lex->nest_level--;
/*
Fields in derived table can be used in upper select in
case of merge. We do not add HAVING fields because we do
not merge such derived. We do not add union because
also do not merge them
*/
if (!sel->next_select())
$2->select_n_where_fields+=
sel->select_n_where_fields;
} }
/*else if (($3->select_lex && /*else if (($3->select_lex &&
$3->select_lex->master_unit()->is_union() && $3->select_lex->master_unit()->is_union() &&
......
storage/innobase/dict/dict0dict.cc
View file @ ab476a8d
This diff is collapsed.
storage/xtradb/dict/dict0dict.cc
View file @ ab476a8d
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7