Skip to content

Commit ece1a09

Browse files
Fix bug 1184287 (Replace innodb_page_size_basic test with upstream
version to fix bzr file-id, cleanup committed .moved files). Changes made: - innodb_page_size_basic test replaced with the Oracle test with their repo file-id; - removed the spurious suffix from COPYING.show_temp_51.moved; - removed spurious .moved files from the repo: deleted mysql-test/suite/sys_vars/r/log_slow_admin_statements_basic.result.moved deleted mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result.moved deleted mysql-test/suite/sys_vars/t/log_slow_admin_statements_basic.test.moved deleted mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test.moved.
1 parent 3e83a89 commit ece1a09

7 files changed

Lines changed: 24 additions & 12 deletions
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
SELECT @@global.innodb_page_size;
2-
@@global.innodb_page_size
3-
16384
1+
SET @orig = @@global.innodb_page_size;
2+
SELECT @orig;
3+
@orig
4+
{valid_page_size}
5+
SET GLOBAL innodb_page_size = 4k;
6+
ERROR HY000: Variable 'innodb_page_size' is a read only variable
7+
SET GLOBAL innodb_page_size = 8k;
8+
ERROR HY000: Variable 'innodb_page_size' is a read only variable

mysql-test/suite/sys_vars/r/log_slow_admin_statements_basic.result.moved

Lines changed: 0 additions & 3 deletions
This file was deleted.

mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result.moved

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
1-
SELECT @@global.innodb_page_size;
1+
#
2+
# Basic test for innodb_page_size
3+
#
4+
5+
-- source include/have_innodb.inc
6+
7+
# Check the default value
8+
SET @orig = @@global.innodb_page_size;
9+
--replace_result 16384 {valid_page_size} 8192 {valid_page_size} 4096 {valid_page_size}
10+
SELECT @orig;
11+
12+
# Confirm that we can not change the value
13+
-- error ER_INCORRECT_GLOBAL_LOCAL_VAR
14+
SET GLOBAL innodb_page_size = 4k;
15+
-- error ER_INCORRECT_GLOBAL_LOCAL_VAR
16+
SET GLOBAL innodb_page_size = 8k;

mysql-test/suite/sys_vars/t/log_slow_admin_statements_basic.test.moved

Lines changed: 0 additions & 1 deletion
This file was deleted.

mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test.moved

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)