Skip to content

Commit 276afe3

Browse files
author
Sergey Vojtovich
committed
WL#6372 - Post-Iris changes to Server defaults
Backport to 5.6.
1 parent 53129f5 commit 276afe3

87 files changed

Lines changed: 2395 additions & 131 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎mysql-test/include/Load_data.inc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--echo ===============
2+
--echo Load the data
3+
--echo ===============
4+
5+
SET @col_1 = repeat('a', 10);
6+
7+
while ($i) {
8+
9+
eval INSERT INTO $table
10+
VALUES (@col_1);
11+
dec $i;
12+
}
13+
commit;
14+

‎mysql-test/include/create_table.inc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--echo ===============
2+
--echo create table & Index
3+
--echo ===============
4+
5+
eval CREATE TABLE $table (col_1 text(10))
6+
ENGINE=INNODB ;
7+
8+

‎mysql-test/include/ib_logfile_size_check.inc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
perl;
2+
my $dir = $ENV{'MYSQLD_DATADIR'};
3+
my $size;
4+
opendir(DIR, $dir) or die $!;
5+
while (my $file = readdir(DIR))
6+
{
7+
8+
next unless ($file =~ m/\ib_logfile.$/);
9+
$size = -s "$dir/$file";
10+
print "The size of the ib_logfile(0/1): $size \n";
11+
}
12+
close(DIR);
13+
exit(0)
14+
EOF

‎mysql-test/include/mtr_warnings.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@ INSERT INTO global_suppressions VALUES
239239
of events, this warning is emitted.
240240
*/
241241
("Slave SQL: Coordinator thread of multi-threaded slave is being stopped in the middle of assigning a group of events.*"),
242+
243+
("Changed limits: max_open_files: * max_connections: * table_cache: *"),
244+
("Could not increase number of max_open_files to more than *"),
242245

243246
("THE_LAST_SUPPRESSION")||
244247

‎mysql-test/include/mysqld--help.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ perl;
1818
# their paths may vary:
1919
@skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
2020
log-slow-queries pid-file slow-query-log-file
21-
datadir slave-load-tmpdir tmpdir socket/;
21+
datadir slave-load-tmpdir tmpdir socket table-definition-cache table-open-cache/;
2222

2323
# Plugins which may or may not be there:
2424
@plugins=qw/innodb ndb ndbinfo archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file

‎mysql-test/include/vardir_size_check.inc‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--echo Check the size of the vardir
2+
--echo The output size is in unit blocks
3+
perl;
4+
#!/usr/bin/perl
5+
use warnings;
6+
use strict;
7+
use File::Find;
8+
my $dir = $ENV{'MYSQLTEST_VARDIR'};
9+
my $size = 0;
10+
find( sub { $size += -f $_ ? -s _ : 0 }, $dir );
11+
12+
if ( $size < 1717987000 )
13+
{ print "TRUE", "\n";}
14+
else
15+
{ print "FALSE $size", "\n";}
16+
17+
18+
## Expected size for the VAR dir being changed for the PB2 runs
19+
20+
##if ( $size =~ /^496[\d]{5}$/ )
21+
## {
22+
## { print "TRUE", "\n";}
23+
## }
24+
##else
25+
## { print "FALSE $size", "\n";}
26+
EOF

‎mysql-test/r/innodb_log_file_size_functionality.result‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
'#________________________VAR_09_INNODB_LOG_FILE_SIZE__________________#'
2+
echo '##'
3+
--echo '#---------------------WL6372_VAR_9_01----------------------#'
4+
####################################################################
5+
# Checking default value #
6+
####################################################################
7+
SELECT COUNT(@@GLOBAL.innodb_log_file_size)
8+
1 Expected
9+
SELECT @@GLOBAL.innodb_log_file_size;
10+
@@GLOBAL.innodb_log_file_size
11+
5242880
12+
5242880 Expected
13+
'#---------------------WL6372_VAR_9_02----------------------#'
14+
SET @@local.innodb_log_file_size=1;
15+
ERROR HY000: Variable 'innodb_log_file_size' is a read only variable
16+
Expected error 'Read only variable'
17+
SET @@session.innodb_log_file_size=1;
18+
ERROR HY000: Variable 'innodb_log_file_size' is a read only variable
19+
Expected error 'Read only variable'
20+
SET @@GLOBAL.innodb_log_file_size=1;
21+
ERROR HY000: Variable 'innodb_log_file_size' is a read only variable
22+
Expected error 'Read only variable'
23+
SET @@GLOBAL.innodb_log_file_size=DEFAULT;
24+
ERROR HY000: Variable 'innodb_log_file_size' is a read only variable
25+
Expected error 'Read only variable'
26+
SELECT COUNT(@@GLOBAL.innodb_log_file_size);
27+
COUNT(@@GLOBAL.innodb_log_file_size)
28+
1
29+
1 Expected
30+
'#---------------------WL6372_VAR_9_03----------------------#'
31+
SELECT @@GLOBAL.innodb_log_file_size = VARIABLE_VALUE
32+
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
33+
WHERE VARIABLE_NAME='innodb_log_file_size';
34+
@@GLOBAL.innodb_log_file_size = VARIABLE_VALUE
35+
1
36+
1 Expected
37+
SELECT COUNT(@@GLOBAL.innodb_log_file_size);
38+
COUNT(@@GLOBAL.innodb_log_file_size)
39+
1
40+
1 Expected
41+
SELECT COUNT(VARIABLE_VALUE)
42+
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
43+
WHERE VARIABLE_NAME='innodb_log_file_size';
44+
COUNT(VARIABLE_VALUE)
45+
1
46+
1 Expected
47+
'#---------------------WL6372_VAR_9_04----------------------#'
48+
SELECT @@innodb_log_file_size = @@GLOBAL.innodb_log_file_size;
49+
@@innodb_log_file_size = @@GLOBAL.innodb_log_file_size
50+
1
51+
1 Expected
52+
SELECT COUNT(@@local.innodb_log_file_size);
53+
ERROR HY000: Variable 'innodb_log_file_size' is a GLOBAL variable
54+
Expected error 'Variable is a GLOBAL variable'
55+
SELECT COUNT(@@SESSION.innodb_log_file_size);
56+
ERROR HY000: Variable 'innodb_log_file_size' is a GLOBAL variable
57+
Expected error 'Variable is a GLOBAL variable'
58+
SELECT COUNT(@@GLOBAL.innodb_log_file_size);
59+
COUNT(@@GLOBAL.innodb_log_file_size)
60+
1
61+
1 Expected
62+
SELECT innodb_log_file_size = @@SESSION.innodb_log_file_size;
63+
ERROR 42S22: Unknown column 'innodb_log_file_size' in 'field list'
64+
Expected error 'Unknown column innodb_log_file_size in field list'
65+
'#---------------------WL6372_VAR_9_05----------------------#'
66+
Check the size of the vardir
67+
The output size is in unit blocks
68+
TRUE
69+
TRUE Expected
70+
'#---------------------WL6372_VAR_9_06----------------------#'
71+
The size of the ib_logfile(0/1): 5242880
72+
The size of the ib_logfile(0/1): 5242880
73+
5242880 expected

‎mysql-test/r/innodb_mysql_sync.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
297297
SET DEBUG_SYNC= 'now SIGNAL continue2';
298298
SET DEBUG_SYNC= 'now WAIT_FOR binlog';
299299
# Now both reads and writes should be blocked.
300-
SELECT * FROM t1;
300+
SELECT * FROM t1 limit 1;
301301
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
302302
INSERT INTO t1 VALUES (5,5);
303303
ERROR HY000: Lock wait timeout exceeded; try restarting transaction

‎mysql-test/r/lowercase_table_qcache.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ select * from MySQL.db;
2121
show status like "Qcache_queries_in_cache";
2222
Variable_name Value
2323
Qcache_queries_in_cache 0
24-
set GLOBAL query_cache_size=0;
24+
set GLOBAL query_cache_size=DEFAULT;

‎mysql-test/r/merge.result‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2414,6 +2414,8 @@ End of 5.1 tests
24142414
#
24152415
drop table if exists t_parent;
24162416
set @save_table_definition_cache=@@global.table_definition_cache;
2417+
set @save_table_open_cache=@@global.table_open_cache;
2418+
set @@global.table_open_cache=400;
24172419
#
24182420
# Set @@global.table_definition_cache to minimum
24192421
#
@@ -2442,6 +2444,7 @@ deallocate prepare stmt;
24422444
#
24432445
drop table t_parent;
24442446
set @@global.table_definition_cache=@save_table_definition_cache;
2447+
set @@global.table_open_cache=@save_table_open_cache;
24452448
DROP DATABASE IF EXISTS mysql_test1;
24462449
CREATE DATABASE mysql_test1;
24472450
CREATE TABLE t1 ... DATA DIRECTORY=... INDEX DIRECTORY=...

0 commit comments

Comments
 (0)