Skip to content

Commit 547cb28

Browse files
dr-mdr-m
committed
Merge 10.1 into 10.2
2 parents 5a1d931 + 713e427 commit 547cb28

File tree

16 files changed

+1786
-233
lines changed

16 files changed

+1786
-233
lines changed

‎mysql-test/suite/innodb/r/innodb_sys_var_valgrind.result

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#
2+
# Bug #29717909 MEMORY LIFETIME OF VARIABLES BETWEEN CHECK AND UPDATE INCORRECTLY MANAGED
3+
#
4+
select @@innodb_ft_server_stopword_table;
5+
@@innodb_ft_server_stopword_table
6+
NULL
7+
create table user_stopword_1(value varchar(30)) engine = innodb;
8+
create table user_stopword_2(value varchar(30)) engine = innodb;
9+
set @blah = 'test/user_stopword_1';
10+
SET GLOBAL innodb_ft_server_stopword_table= @blah;
11+
select @@innodb_ft_server_stopword_table;
12+
@@innodb_ft_server_stopword_table
13+
test/user_stopword_1
14+
set @blah = 'test/user_stopword_2';
15+
SET GLOBAL innodb_ft_server_stopword_table= @blah;
16+
select @@innodb_ft_server_stopword_table;
17+
@@innodb_ft_server_stopword_table
18+
test/user_stopword_2
19+
SET GLOBAL innodb_ft_server_stopword_table= NULL;
20+
select @@innodb_ft_server_stopword_table;
21+
@@innodb_ft_server_stopword_table
22+
NULL
23+
SET GLOBAL innodb_ft_server_stopword_table= default;
24+
select @@innodb_ft_server_stopword_table;
25+
@@innodb_ft_server_stopword_table
26+
NULL
27+
drop table user_stopword_1, user_stopword_2;
28+
select @@innodb_buffer_pool_filename;
29+
@@innodb_buffer_pool_filename
30+
ib_buffer_pool
31+
set @blah='hello';
32+
set global innodb_buffer_pool_filename = @blah;
33+
select @@innodb_buffer_pool_filename;
34+
@@innodb_buffer_pool_filename
35+
hello
36+
set global innodb_buffer_pool_filename="bye";
37+
select @@innodb_buffer_pool_filename;
38+
@@innodb_buffer_pool_filename
39+
bye
40+
set global innodb_buffer_pool_filename=NULL;
41+
ERROR 42000: Variable 'innodb_buffer_pool_filename' can't be set to the value of 'NULL'
42+
select @@innodb_buffer_pool_filename;
43+
@@innodb_buffer_pool_filename
44+
bye
45+
set global innodb_buffer_pool_filename=default;
46+
select @@innodb_buffer_pool_filename;
47+
@@innodb_buffer_pool_filename
48+
ib_buffer_pool
49+
CREATE TABLE t1 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
50+
opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
51+
(opening_line)) ENGINE=InnoDB;
52+
CREATE TABLE t2 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
53+
opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
54+
(opening_line)) ENGINE=InnoDB;
55+
select @@innodb_ft_aux_table;
56+
@@innodb_ft_aux_table
57+
NULL
58+
set @blah = 'test/t1';
59+
SET GLOBAL innodb_ft_aux_table = @blah;
60+
select @@innodb_ft_aux_table;
61+
@@innodb_ft_aux_table
62+
test/t1
63+
set @blah = 'test/t2';
64+
SET GLOBAL innodb_ft_aux_table = @blah;
65+
SET GLOBAL innodb_ft_aux_table = NULL;
66+
select @@innodb_ft_aux_table;
67+
@@innodb_ft_aux_table
68+
NULL
69+
SET GLOBAL innodb_ft_aux_table =default;
70+
select @@innodb_ft_aux_table;
71+
@@innodb_ft_aux_table
72+
NULL
73+
drop table t1,t2;

‎mysql-test/suite/innodb/t/innodb_sys_var_valgrind.test

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
--source include/have_innodb.inc
2+
3+
--echo #
4+
--echo # Bug #29717909 MEMORY LIFETIME OF VARIABLES BETWEEN CHECK AND UPDATE INCORRECTLY MANAGED
5+
--echo #
6+
7+
#Test innodb_ft_server_stopword_table (global variable)
8+
select @@innodb_ft_server_stopword_table;
9+
create table user_stopword_1(value varchar(30)) engine = innodb;
10+
create table user_stopword_2(value varchar(30)) engine = innodb;
11+
12+
set @blah = 'test/user_stopword_1';
13+
SET GLOBAL innodb_ft_server_stopword_table= @blah;
14+
select @@innodb_ft_server_stopword_table;
15+
16+
set @blah = 'test/user_stopword_2';
17+
SET GLOBAL innodb_ft_server_stopword_table= @blah;
18+
select @@innodb_ft_server_stopword_table;
19+
20+
SET GLOBAL innodb_ft_server_stopword_table= NULL;
21+
select @@innodb_ft_server_stopword_table;
22+
23+
SET GLOBAL innodb_ft_server_stopword_table= default;
24+
select @@innodb_ft_server_stopword_table;
25+
26+
drop table user_stopword_1, user_stopword_2;
27+
28+
#Test innodb_buffer_pool_filename (global variable)
29+
30+
select @@innodb_buffer_pool_filename;
31+
32+
set @blah='hello';
33+
set global innodb_buffer_pool_filename = @blah;
34+
select @@innodb_buffer_pool_filename;
35+
36+
set global innodb_buffer_pool_filename="bye";
37+
select @@innodb_buffer_pool_filename;
38+
39+
--error ER_WRONG_VALUE_FOR_VAR
40+
set global innodb_buffer_pool_filename=NULL;
41+
select @@innodb_buffer_pool_filename;
42+
43+
set global innodb_buffer_pool_filename=default;
44+
select @@innodb_buffer_pool_filename;
45+
46+
#Test innodb_ft_aux_table (global variable)
47+
CREATE TABLE t1 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
48+
opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
49+
(opening_line)) ENGINE=InnoDB;
50+
51+
CREATE TABLE t2 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
52+
opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
53+
(opening_line)) ENGINE=InnoDB;
54+
55+
select @@innodb_ft_aux_table;
56+
57+
set @blah = 'test/t1';
58+
SET GLOBAL innodb_ft_aux_table = @blah;
59+
select @@innodb_ft_aux_table;
60+
61+
set @blah = 'test/t2';
62+
SET GLOBAL innodb_ft_aux_table = @blah;
63+
64+
SET GLOBAL innodb_ft_aux_table = NULL;
65+
select @@innodb_ft_aux_table;
66+
67+
SET GLOBAL innodb_ft_aux_table =default;
68+
select @@innodb_ft_aux_table;
69+
70+
drop table t1,t2;

0 commit comments

Comments
 (0)