diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-07 13:56:48 +0300 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-07 13:56:48 +0300 |
| commit | abaeea49937bd2beb6efdf4538d8508a5032b0cc (patch) | |
| tree | 29cd0f1f021df754a7306aeb68f66cf5162efeb3 /mysql-test/t | |
| parent | 6c68f27cc40cd6e0dff3642657a656ac21206441 (diff) | |
| parent | c3a066e4035a16a666e71a55f47c14c29649e580 (diff) | |
| download | mariadb-git-abaeea49937bd2beb6efdf4538d8508a5032b0cc.tar.gz | |
merge
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/t/key_cache.test:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/key_cache.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/key_cache.test b/mysql-test/t/key_cache.test index 6dee87ec5a6..5ff26b315e2 100644 --- a/mysql-test/t/key_cache.test +++ b/mysql-test/t/key_cache.test @@ -71,7 +71,7 @@ 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 +--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'; insert into t1 values (1, 'qqqq'), (11, 'yyyy'); @@ -84,7 +84,7 @@ 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 +--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'; cache index t1 key (`primary`) in keycache1; @@ -146,7 +146,7 @@ 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 +--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'; # Cleanup |