database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fix for LPBUG#516148 Test maria.maria3 fails when --without-maria-tmp-tables is set

Browse Source 
mysql-test/suite/maria/r/maria3.result:
  Updated test results
mysql-test/suite/maria/t/maria3.test:
  Don't show maria_used_for_temp_tables, as it's value is depending on configure options
This commit is contained in:
Michael Widenius
2010-02-12 16:21:13 +02:00
parent 6e0d92419e
commit 6e7241caa5
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/maria/r/maria3.result
View File

@@ -301,7 +301,7 @@ check table t1 extended;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
drop table t1; drop table t1;
show variables like 'maria%'; select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "maria%" and variable_name not like "maria_used_for_temp_tables" order by 1;
Variable_name Value Variable_name Value
maria_block_size 8192 maria_block_size 8192
maria_checkpoint_interval 30 maria_checkpoint_interval 30
@@ -309,16 +309,15 @@ maria_force_start_after_recovery_failures 0
maria_log_file_size 4294959104 maria_log_file_size 4294959104
maria_log_purge_type immediate maria_log_purge_type immediate
maria_max_sort_file_size 9223372036853727232 maria_max_sort_file_size 9223372036853727232
maria_page_checksum OFF
maria_pagecache_age_threshold 300 maria_pagecache_age_threshold 300
maria_pagecache_buffer_size 8384512 maria_pagecache_buffer_size 8384512
maria_pagecache_division_limit 100 maria_pagecache_division_limit 100
maria_page_checksum OFF
maria_recover OFF maria_recover OFF
maria_repair_threads 1 maria_repair_threads 1
maria_sort_buffer_size 8388608 maria_sort_buffer_size 8388608
maria_stats_method nulls_unequal maria_stats_method nulls_unequal
maria_sync_log_dir NEWFILE maria_sync_log_dir NEWFILE
maria_used_for_temp_tables ON
show status like 'maria%'; show status like 'maria%';
Variable_name Value Variable_name Value
Maria_pagecache_blocks_not_flushed # Maria_pagecache_blocks_not_flushed #

2
mysql-test/suite/maria/t/maria3.test
View File

@@ -259,7 +259,7 @@ drop table t1;
# Fix if we are using safemalloc # Fix if we are using safemalloc
--replace_result 8388572 8388600 --replace_result 8388572 8388600
show variables like 'maria%'; select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "maria%" and variable_name not like "maria_used_for_temp_tables" order by 1;
--replace_column 2 # --replace_column 2 #
show status like 'maria%'; show status like 'maria%';

2
storage/maria/ha_maria.cc
View File

@@ -3278,11 +3278,11 @@ static struct st_mysql_sys_var* system_variables[]= {
MYSQL_SYSVAR(block_size), MYSQL_SYSVAR(block_size),
MYSQL_SYSVAR(checkpoint_interval), MYSQL_SYSVAR(checkpoint_interval),
MYSQL_SYSVAR(force_start_after_recovery_failures), MYSQL_SYSVAR(force_start_after_recovery_failures),
MYSQL_SYSVAR(page_checksum),
MYSQL_SYSVAR(log_dir_path), MYSQL_SYSVAR(log_dir_path),
MYSQL_SYSVAR(log_file_size), MYSQL_SYSVAR(log_file_size),
MYSQL_SYSVAR(log_purge_type), MYSQL_SYSVAR(log_purge_type),
MYSQL_SYSVAR(max_sort_file_size), MYSQL_SYSVAR(max_sort_file_size),
MYSQL_SYSVAR(page_checksum),
MYSQL_SYSVAR(pagecache_age_threshold), MYSQL_SYSVAR(pagecache_age_threshold),
MYSQL_SYSVAR(pagecache_buffer_size), MYSQL_SYSVAR(pagecache_buffer_size),
MYSQL_SYSVAR(pagecache_division_limit), MYSQL_SYSVAR(pagecache_division_limit),