diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 16:39:50 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 16:39:50 +0200 |
| commit | 918c4a7501c0f73db1d3ab9e030f5a1e251de38f (patch) | |
| tree | 4c8e0d86048af8f491e1e4ef79f4f79801e7ce03 | |
| parent | f3ec486f8249b74035b34dab998107f27d65bed5 (diff) | |
| download | mariadb-git-918c4a7501c0f73db1d3ab9e030f5a1e251de38f.tar.gz | |
8M was too small for the InnoDB data file, needs 10M.
Updating test for smaller InnoDB buffer pool size used by the testsuite.
| -rw-r--r-- | mysql-test/include/default_mysqld.cnf | 2 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 350a5bb39ce..6116b20d8bb 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -13,7 +13,7 @@ key_buffer_size= 1M sort_buffer= 256K max_heap_table_size= 1M -loose-innodb_data_file_path= ibdata1:8M:autoextend +loose-innodb_data_file_path= ibdata1:10M:autoextend loose-innodb_buffer_pool_size= 8M loose-innodb_write_io_threads= 2 loose-innodb_read_io_threads= 2 diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 0b5f3361dd3..b2d672453cf 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1738,7 +1738,7 @@ count(*) drop table t1; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; variable_value -4095 +512 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; variable_value 16384 diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 8a2bc2b2d7f..4f45c30f318 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1317,8 +1317,8 @@ drop table t1; # Test for testable InnoDB status variables. This test # uses previous ones(pages_created, rows_deleted, ...). -# We get one of 4095 or 4096 randomly ---replace_result 4096 4095 +# We get one of 511 or 512 randomly +--replace_result 511 512 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; SELECT variable_value - @innodb_rows_deleted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted'; |