database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Automatic merge

Browse Source
This commit is contained in:
Michael Widenius
2014-07-30 22:05:47 +03:00
parent 14d00cd7f6 f0f2072d1f
commit 1a3d33c5f7
64 changed files with 860 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/r/features.result
View File

@ -1,6 +1,8 @@
drop table if exists t1;
flush status;
show status like "feature%";
Variable_name Value
Feature_delay_key_write 0
Feature_dynamic_columns 0
Feature_fulltext 0
Feature_gis 0
@ -138,3 +140,17 @@ upd1
show status like "feature_xml";
Variable_name Value
Feature_xml 2
#
# Feature delayed_keys
#
create table t1 (a int, key(a)) engine=myisam delay_key_write=1;
insert into t1 values(1);
insert into t1 values(2);
drop table t1;
create table t1 (a int, key(a)) engine=aria delay_key_write=1;
insert into t1 values(1);
insert into t1 values(2);
drop table t1;
show status like "feature_delay_key_write";
Variable_name Value
Feature_delay_key_write 2

33
mysql-test/r/key_cache.result
View File

@ -2,6 +2,7 @@ drop table if exists t1, t2, t3;
SET @save_key_buffer_size=@@key_buffer_size;
SET @save_key_cache_block_size=@@key_cache_block_size;
SET @save_key_cache_segments=@@key_cache_segments;
SET @save_key_cache_file_hash_size=@@key_cache_file_hash_size;
SELECT @@key_buffer_size, @@small.key_buffer_size;
@@key_buffer_size @@small.key_buffer_size
2097152 131072
@ -84,15 +85,15 @@ select @@key_buffer_size;
select @@key_cache_block_size;
@@key_cache_block_size
1024
select @@key_cache_file_hash_size;
@@key_cache_file_hash_size
512
set global keycache1.key_buffer_size=1024*1024;
create table t1 (p int primary key, a char(10)) delay_key_write=1;
create table t2 (p int primary key, i int, a char(10), key k1(i), key k2(a));
show status like 'key_blocks_used';
Variable_name Value
Key_blocks_used 0
show status like 'key_blocks_unused';
Variable_name Value
Key_blocks_unused KEY_BLOCKS_UNUSED
select @org_key_blocks_unused-unused_blocks as key_blocks_unused, used_blocks as key_blocks_used from information_schema.key_caches where key_cache_name="default";
key_blocks_unused key_blocks_used
0 0
insert into t1 values (1, 'qqqq'), (11, 'yyyy');
insert into t2 values (1, 1, 'qqqq'), (2, 1, 'pppp'),
(3, 1, 'yyyy'), (4, 3, 'zzzz');
@ -108,12 +109,9 @@ p i a
4 3 zzzz
update t1 set p=2 where p=1;
update t2 set i=2 where i=1;
show status like 'key_blocks_used';
Variable_name Value
Key_blocks_used 4
show status like 'key_blocks_unused';
Variable_name Value
Key_blocks_unused KEY_BLOCKS_UNUSED
select @org_key_blocks_unused-unused_blocks as key_blocks_unused, used_blocks as key_blocks_used from information_schema.key_caches where key_cache_name="default";
key_blocks_unused key_blocks_used
4 4
cache index t1 key (`primary`) in keycache1;
Table Op Msg_type Msg_text
test.t1 assign_to_keycache status OK
@ -270,12 +268,9 @@ Table Op Msg_type Msg_text
test.t1 assign_to_keycache status OK
test.t2 assign_to_keycache status OK
drop table t1,t2,t3;
show status like 'key_blocks_used';
Variable_name Value
Key_blocks_used 4
show status like 'key_blocks_unused';
Variable_name Value
Key_blocks_unused KEY_BLOCKS_UNUSED
select @org_key_blocks_unused-unused_blocks as key_blocks_unused, used_blocks as key_blocks_used from information_schema.key_caches where key_cache_name="default";
key_blocks_unused key_blocks_used
0 4
create table t1 (a int primary key);
cache index t1 in keycache2;
Table Op Msg_type Msg_text
@ -558,6 +553,7 @@ KEY_CACHE_NAME SEGMENTS SEGMENT_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_B
default 1 NULL 2097152 1024 4 # 0 0 0 0 0
small NULL NULL 1048576 1024 1 # 0 0 0 0 0
set global key_buffer_size=32*1024;
set global key_cache_file_hash_size=128;
select @@key_buffer_size;
@@key_buffer_size
32768
@ -833,3 +829,4 @@ set global keycache1.key_buffer_size=0;
set global keycache2.key_buffer_size=0;
set global key_buffer_size=@save_key_buffer_size;
set global key_cache_segments=@save_key_cache_segments;
set global key_cache_file_hash_size=@save_key_cache_file_hash_size;

4
mysql-test/r/mysql_client_test_comp.result Normal file
View File

@ -0,0 +1,4 @@
SET @old_slow_query_log= @@global.slow_query_log;
call mtr.add_suppression(" Error reading file './client_test_db/test_frm_bug.frm'");
ok
SET @@global.slow_query_log= @old_slow_query_log;

6
mysql-test/r/mysqld--help.result
View File

@ -281,6 +281,11 @@ The following options may be given as the first argument:
The default size of key cache blocks
--key-cache-division-limit=#
The minimum percentage of warm blocks in key cache
--key-cache-file-hash-size=#
Number of hash buckets for open and changed files. If
you have a lot of MyISAM files open you should increase
this for faster flush of changes. A good value is
probably 1/10 of number of possible open MyISAM files.
--key-cache-segments=#
The number of segments in a key cache
-L, --language=name Client error messages in given language. May be given as
@ -1129,6 +1134,7 @@ key-buffer-size 134217728
key-cache-age-threshold 300
key-cache-block-size 1024
key-cache-division-limit 100
key-cache-file-hash-size 512
key-cache-segments 0
large-pages FALSE
lc-messages en_US

1
mysql-test/suite/maria/maria3.result
View File

@ -314,6 +314,7 @@ aria_max_sort_file_size 9223372036853727232
aria_pagecache_age_threshold 300
aria_pagecache_buffer_size 8388608
aria_pagecache_division_limit 100
aria_pagecache_file_hash_size 512
aria_page_checksum OFF
aria_recover NORMAL
aria_repair_threads 1

21
mysql-test/suite/sys_vars/r/aria_pagecache_file_hash_size_basic.result Normal file
View File

@ -0,0 +1,21 @@
select @@global.aria_pagecache_file_hash_size;
@@global.aria_pagecache_file_hash_size
512
select @@session.aria_pagecache_file_hash_size;
ERROR HY000: Variable 'aria_pagecache_file_hash_size' is a GLOBAL variable
show global variables like 'aria_pagecache_file_hash_size';
Variable_name Value
aria_pagecache_file_hash_size 512
show session variables like 'aria_pagecache_file_hash_size';
Variable_name Value
aria_pagecache_file_hash_size 512
select * from information_schema.global_variables where variable_name='aria_pagecache_file_hash_size';
VARIABLE_NAME VARIABLE_VALUE
ARIA_PAGECACHE_FILE_HASH_SIZE 512
select * from information_schema.session_variables where variable_name='aria_pagecache_file_hash_size';
VARIABLE_NAME VARIABLE_VALUE
ARIA_PAGECACHE_FILE_HASH_SIZE 512
set global aria_pagecache_file_hash_size=200;
ERROR HY000: Variable 'aria_pagecache_file_hash_size' is a read only variable
set session aria_pagecache_file_hash_size=200;
ERROR HY000: Variable 'aria_pagecache_file_hash_size' is a read only variable

114
mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result Normal file
View File

@ -0,0 +1,114 @@
SET @start_value = @@global.key_cache_file_hash_size;
SELECT @start_value;
@start_value
512
'#--------------------FN_DYNVARS_056_01------------------------#'
SET @@global.key_cache_file_hash_size = DEFAULT;
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
512
'#---------------------FN_DYNVARS_056_02-------------------------#'
SET @@global.key_cache_file_hash_size = @start_value;
SELECT @@global.key_cache_file_hash_size = 300;
@@global.key_cache_file_hash_size = 300
0
'#--------------------FN_DYNVARS_056_03------------------------#'
SET @@global.key_cache_file_hash_size = 128;
SET @@global.key_cache_file_hash_size = 16384;
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
16384
'#--------------------FN_DYNVARS_056_04-------------------------#'
SET @@global.key_cache_file_hash_size = -1;
Warnings:
Warning 1292 Truncated incorrect key_cache_file_hash_size value: '-1'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
128
SET @@global.key_cache_file_hash_size = 42949672951;
Warnings:
Warning 1292 Truncated incorrect key_cache_file_hash_size value: '42949672951'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
16384
SET @@global.key_cache_file_hash_size = 10000.01;
ERROR 42000: Incorrect argument type to variable 'key_cache_file_hash_size'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
16384
SET @@global.key_cache_file_hash_size = -1024;
Warnings:
Warning 1292 Truncated incorrect key_cache_file_hash_size value: '-1024'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
128
SET @@global.key_cache_file_hash_size = 99;
Warnings:
Warning 1292 Truncated incorrect key_cache_file_hash_size value: '99'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
128
SET @@global.key_cache_file_hash_size = ON;
ERROR 42000: Incorrect argument type to variable 'key_cache_file_hash_size'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
128
SET @@global.key_cache_file_hash_size = 'test';
ERROR 42000: Incorrect argument type to variable 'key_cache_file_hash_size'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
128
'#-------------------FN_DYNVARS_056_05----------------------------#'
SET @@session.key_cache_file_hash_size = 0;
ERROR HY000: Variable 'key_cache_file_hash_size' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@session.key_cache_file_hash_size;
ERROR HY000: Variable 'key_cache_file_hash_size' is a GLOBAL variable
'#----------------------FN_DYNVARS_056_06------------------------#'
SELECT @@global.key_cache_file_hash_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='key_cache_file_hash_size';
@@global.key_cache_file_hash_size = VARIABLE_VALUE
1
SELECT @@key_cache_file_hash_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='key_cache_file_hash_size';
@@key_cache_file_hash_size = VARIABLE_VALUE
1
'#---------------------FN_DYNVARS_056_07----------------------#'
SET @@global.key_cache_file_hash_size = TRUE;
Warnings:
Warning 1292 Truncated incorrect key_cache_file_hash_size value: '1'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
128
SET @@global.key_cache_file_hash_size = FALSE;
Warnings:
Warning 1292 Truncated incorrect key_cache_file_hash_size value: '0'
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
128
'#---------------------FN_DYNVARS_056_08----------------------#'
SET @@global.key_cache_file_hash_size = 150;
SELECT @@key_cache_file_hash_size = @@global.key_cache_file_hash_size;
@@key_cache_file_hash_size = @@global.key_cache_file_hash_size
1
'#---------------------FN_DYNVARS_056_09----------------------#'
SET key_cache_file_hash_size = 8000;
ERROR HY000: Variable 'key_cache_file_hash_size' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@key_cache_file_hash_size;
@@key_cache_file_hash_size
150
SET local.key_cache_file_hash_size = 10;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_file_hash_size = 10' at line 1
SELECT local.key_cache_file_hash_size;
ERROR 42S02: Unknown table 'local' in field list
SET global.key_cache_file_hash_size = 10;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_file_hash_size = 10' at line 1
SELECT global.key_cache_file_hash_size;
ERROR 42S02: Unknown table 'global' in field list
SELECT key_cache_file_hash_size = @@session.key_cache_file_hash_size;
ERROR 42S22: Unknown column 'key_cache_file_hash_size' in 'field list'
SET @@global.key_cache_file_hash_size = @start_value;
SELECT @@global.key_cache_file_hash_size;
@@global.key_cache_file_hash_size
512

22
mysql-test/suite/sys_vars/t/aria_pagecache_file_hash_size_basic.test Normal file
View File

@ -0,0 +1,22 @@
# ulong readonly
--source include/have_maria.inc
#
# show the global and session values;
#
select @@global.aria_pagecache_file_hash_size;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.aria_pagecache_file_hash_size;
show global variables like 'aria_pagecache_file_hash_size';
show session variables like 'aria_pagecache_file_hash_size';
select * from information_schema.global_variables where variable_name='aria_pagecache_file_hash_size';
select * from information_schema.session_variables where variable_name='aria_pagecache_file_hash_size';
#
# show that it's read-only
#
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set global aria_pagecache_file_hash_size=200;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set session aria_pagecache_file_hash_size=200;

168
mysql-test/suite/sys_vars/t/key_cache_file_hash_size_basic.test Normal file
View File

@ -0,0 +1,168 @@
################# mysql-test\t\key_cache_file_hash_size.test ##################
# #
# Variable Name: key_cache_file_hash_size #
# Scope: GLOBAL #
# Access Type: Dynamic #
# Data Type: numeric #
# Default Value: 300 #
# Range: 100-4294967295 #
# #
# #
# Creation Date: 2008-02-07 #
# Author: Salman #
# #
# Description: Test Cases of Dynamic System Variable key_cache_file_hash_size #
# that checks the behavior of this variable in the following ways#
# * Default Value #
# * Valid & Invalid values #
# * Scope & Access method #
# * Data Integrity #
# #
# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
# server-system-variables.html #
# #
###############################################################################
--source include/load_sysvars.inc
########################################################################
# START OF key_cache_file_hash_size TESTS #
########################################################################
#############################################################################
# Saving initial value of key_cache_file_hash_size in a temporary variable #
#############################################################################
SET @start_value = @@global.key_cache_file_hash_size;
SELECT @start_value;
--echo '#--------------------FN_DYNVARS_056_01------------------------#'
################################################################################
# Display the DEFAULT value of key_cache_file_hash_size #
################################################################################
SET @@global.key_cache_file_hash_size = DEFAULT;
SELECT @@global.key_cache_file_hash_size;
--echo '#---------------------FN_DYNVARS_056_02-------------------------#'
###############################################
# Verify default value of variable #
###############################################
SET @@global.key_cache_file_hash_size = @start_value;
SELECT @@global.key_cache_file_hash_size = 300;
--echo '#--------------------FN_DYNVARS_056_03------------------------#'
###############################################################################
# Change the value of key_cache_file_hash_size to a valid value #
###############################################################################
SET @@global.key_cache_file_hash_size = 128;
SET @@global.key_cache_file_hash_size = 16384;
SELECT @@global.key_cache_file_hash_size;
--echo '#--------------------FN_DYNVARS_056_04-------------------------#'
###########################################################################
# Change the value of key_cache_file_hash_size to invalid value #
###########################################################################
SET @@global.key_cache_file_hash_size = -1;
SELECT @@global.key_cache_file_hash_size;
SET @@global.key_cache_file_hash_size = 42949672951;
SELECT @@global.key_cache_file_hash_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_cache_file_hash_size = 10000.01;
SELECT @@global.key_cache_file_hash_size;
SET @@global.key_cache_file_hash_size = -1024;
SELECT @@global.key_cache_file_hash_size;
SET @@global.key_cache_file_hash_size = 99;
SELECT @@global.key_cache_file_hash_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_cache_file_hash_size = ON;
SELECT @@global.key_cache_file_hash_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_cache_file_hash_size = 'test';
SELECT @@global.key_cache_file_hash_size;
--echo '#-------------------FN_DYNVARS_056_05----------------------------#'
###########################################################################
# Test if accessing session key_cache_file_hash_size gives error #
###########################################################################
--Error ER_GLOBAL_VARIABLE
SET @@session.key_cache_file_hash_size = 0;
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.key_cache_file_hash_size;
--echo '#----------------------FN_DYNVARS_056_06------------------------#'
##############################################################################
# Check if the value in GLOBAL & SESSION Tables matches values in variable #
##############################################################################
SELECT @@global.key_cache_file_hash_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='key_cache_file_hash_size';
SELECT @@key_cache_file_hash_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='key_cache_file_hash_size';
--echo '#---------------------FN_DYNVARS_056_07----------------------#'
###################################################################
# Check if TRUE and FALSE values can be used on variable #
###################################################################
SET @@global.key_cache_file_hash_size = TRUE;
SELECT @@global.key_cache_file_hash_size;
SET @@global.key_cache_file_hash_size = FALSE;
SELECT @@global.key_cache_file_hash_size;
--echo '#---------------------FN_DYNVARS_056_08----------------------#'
########################################################################################################
# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable #
########################################################################################################
SET @@global.key_cache_file_hash_size = 150;
SELECT @@key_cache_file_hash_size = @@global.key_cache_file_hash_size;
--echo '#---------------------FN_DYNVARS_056_09----------------------#'
########################################################################## #######
# Check if key_cache_file_hash_size can be accessed with and without @@ sign #
##################################################################################
--Error ER_GLOBAL_VARIABLE
SET key_cache_file_hash_size = 8000;
SELECT @@key_cache_file_hash_size;
--Error ER_PARSE_ERROR
SET local.key_cache_file_hash_size = 10;
--Error ER_UNKNOWN_TABLE
SELECT local.key_cache_file_hash_size;
--Error ER_PARSE_ERROR
SET global.key_cache_file_hash_size = 10;
--Error ER_UNKNOWN_TABLE
SELECT global.key_cache_file_hash_size;
--Error ER_BAD_FIELD_ERROR
SELECT key_cache_file_hash_size = @@session.key_cache_file_hash_size;
##############################
# Restore initial value #
##############################
SET @@global.key_cache_file_hash_size = @start_value;
SELECT @@global.key_cache_file_hash_size;
########################################################################
# END OF key_cache_file_hash_size TESTS #
########################################################################

19
mysql-test/t/features.test
View File

@ -6,6 +6,8 @@
drop table if exists t1;
--enable_warnings
flush status;
show status like "feature%";
--echo #
@ -109,3 +111,20 @@ select updatexml('<div><div><span>1</span><span>2</span></div></div>',
'/','<tr><td>1</td><td>2</td></tr>') as upd1;
--replace_result 4 2
show status like "feature_xml";
--echo #
--echo # Feature delayed_keys
--echo #
create table t1 (a int, key(a)) engine=myisam delay_key_write=1;
insert into t1 values(1);
insert into t1 values(2);
drop table t1;
create table t1 (a int, key(a)) engine=aria delay_key_write=1;
insert into t1 values(1);
insert into t1 values(2);
drop table t1;
show status like "feature_delay_key_write";

32
mysql-test/t/key_cache.test
View File

@ -8,6 +8,7 @@ drop table if exists t1, t2, t3;
SET @save_key_buffer_size=@@key_buffer_size;
SET @save_key_cache_block_size=@@key_cache_block_size;
SET @save_key_cache_segments=@@key_cache_segments;
SET @save_key_cache_file_hash_size=@@key_cache_file_hash_size;
SELECT @@key_buffer_size, @@small.key_buffer_size;
@ -62,19 +63,19 @@ select @@keycache1.key_buffer_size;
select @@keycache1.key_cache_block_size;
select @@key_buffer_size;
select @@key_cache_block_size;
select @@key_cache_file_hash_size;
set global keycache1.key_buffer_size=1024*1024;
let org_key_blocks_unused=`select unused_blocks as unused from information_schema.key_caches where key_cache_name="default"`;
--disable_query_log
eval set @org_key_blocks_unused=$org_key_blocks_unused;
--enable_query_log
create table t1 (p int primary key, a char(10)) delay_key_write=1;
create table t2 (p int primary key, i int, a char(10), key k1(i), key k2(a));
show status like 'key_blocks_used';
# Following results differs on 64 and 32 bit systems because of different
# pointer sizes, which takes up different amount of space in key cache
--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED 1824 KEY_BLOCKS_UNUSED
show status like 'key_blocks_unused';
select @org_key_blocks_unused-unused_blocks as key_blocks_unused, used_blocks as key_blocks_used from information_schema.key_caches where key_cache_name="default";
insert into t1 values (1, 'qqqq'), (11, 'yyyy');
insert into t2 values (1, 1, 'qqqq'), (2, 1, 'pppp'),
@ -85,9 +86,7 @@ select * from t2;
update t1 set p=2 where p=1;
update t2 set i=2 where i=1;
show status like 'key_blocks_used';
--replace_result 1808 KEY_BLOCKS_UNUSED 1789 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1814 KEY_BLOCKS_UNUSED 1820 KEY_BLOCKS_UNUSED
show status like 'key_blocks_unused';
select @org_key_blocks_unused-unused_blocks as key_blocks_unused, used_blocks as key_blocks_used from information_schema.key_caches where key_cache_name="default";
cache index t1 key (`primary`) in keycache1;
@ -147,9 +146,7 @@ cache index t3 in keycache2;
cache index t1,t2 in default;
drop table t1,t2,t3;
show status like 'key_blocks_used';
--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED 1824 KEY_BLOCKS_UNUSED
show status like 'key_blocks_unused';
select @org_key_blocks_unused-unused_blocks as key_blocks_unused, used_blocks as key_blocks_used from information_schema.key_caches where key_cache_name="default";
create table t1 (a int primary key);
cache index t1 in keycache2;
@ -304,7 +301,7 @@ select * from t2;
update t1 set p=3 where p=1;
update t2 set i=2 where i=1;
--replace_result 1808 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1789 KEY_BLOCKS_UNUSED
--replace_result 1801 KEY_BLOCKS_UNUSED 1663 KEY_BLOCKS_UNUSED 1782 KEY_BLOCKS_UNUSED
show status like 'key_%';
--replace_column 7 #
select * from information_schema.key_caches where segment_number is null;
@ -336,7 +333,8 @@ select * from t2;
update t1 set p=3 where p=1;
update t2 set i=2 where i=1;
--replace_result 1808 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1788 KEY_BLOCKS_UNUSED
--replace_result 1794 KEY_BLOCKS_UNUSED 1656 KEY_BLOCKS_UNUSED 1775 KEY_BLOCKS_UNUSED
show status like 'key_%';
--replace_column 7 #
select * from information_schema.key_caches where segment_number is null;
@ -361,7 +359,7 @@ select * from t2;
update t1 set p=3 where p=1;
update t2 set i=2 where i=1;
--replace_result 1808 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1789 KEY_BLOCKS_UNUSED
--replace_result 1801 KEY_BLOCKS_UNUSED 1663 KEY_BLOCKS_UNUSED 1782 KEY_BLOCKS_UNUSED
show status like 'key_%';
--replace_column 7 #
select * from information_schema.key_caches where segment_number is null;
@ -378,6 +376,7 @@ select * from information_schema.key_caches where segment_number is null;
# Switch back to 2 segments
set global key_buffer_size=32*1024;
set global key_cache_file_hash_size=128;
select @@key_buffer_size;
set global key_cache_segments=2;
select @@key_cache_segments;
@ -536,5 +535,6 @@ set global keycache2.key_buffer_size=0;
set global key_buffer_size=@save_key_buffer_size;
set global key_cache_segments=@save_key_cache_segments;
set global key_cache_file_hash_size=@save_key_cache_file_hash_size;
# End of 5.2 tests

1
mysql-test/t/mysql_client_test-master.opt
View File

@ -1,3 +1,4 @@
--general-log
--general-log-file=$MYSQLTEST_VARDIR/log/master.log
--log-output=FILE,TABLE
--max-allowed-packet=32000000

2
mysql-test/t/mysql_client_test_comp-master.opt Normal file
View File

@ -0,0 +1,2 @@
--loose-enable-performance-schema
--max-allowed-packet=32000000

20
mysql-test/t/mysql_client_test_comp.test Normal file
View File

@ -0,0 +1,20 @@
# run mysql_client_test with performance schema
# No need to run this with embedded server
-- source include/not_embedded.inc
# need to have the dynamic loading turned on for the client plugin tests
--source include/have_plugin_auth.inc
SET @old_slow_query_log= @@global.slow_query_log;
call mtr.add_suppression(" Error reading file './client_test_db/test_frm_bug.frm'");
--exec echo "$MYSQL_CLIENT_TEST" > $MYSQLTEST_VARDIR/log/mysql_client_test_comp.out.log 2>&1
--exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M >> $MYSQLTEST_VARDIR/log/mysql_client_test_comp.out.log 2>&1
# End of test
echo ok;
# Restore state changed by mysql_test_run
SET @@global.slow_query_log= @old_slow_query_log;

1
mysql-test/t/mysql_client_test_nonblock-master.opt
View File

@ -1 +1,2 @@
--general-log --general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE
--max-allowed-packet=32000000