Skip to content

M
MariaDB
Commit e75f0e71 authored by Sneha Modi's avatar Sneha Modi
Browse files
Options

Fixing a few broken tests.

parent 1c2dc010
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 28 deletions
mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
View file @ e75f0e71
SET @start_global_value = @@global.innodb_file_per_table;
SELECT @start_global_value;
@start_global_value
0
'#---------------------BS_STVARS_028_01----------------------#' '#---------------------BS_STVARS_028_01----------------------#'
SELECT COUNT(@@GLOBAL.innodb_file_per_table); SELECT COUNT(@@GLOBAL.innodb_file_per_table);
COUNT(@@GLOBAL.innodb_file_per_table) COUNT(@@GLOBAL.innodb_file_per_table)
1 1
1 Expected 1 Expected
'#---------------------BS_STVARS_028_02----------------------#' '#---------------------BS_STVARS_028_02----------------------#'
SELECT COUNT(@@GLOBAL.innodb_file_per_table); SET @@global.innodb_file_per_table = 0;
COUNT(@@GLOBAL.innodb_file_per_table) SELECT @@global.innodb_file_per_table;
@@global.innodb_file_per_table
0
SET @@global.innodb_file_per_table ='On' ;
SELECT @@global.innodb_file_per_table;
@@global.innodb_file_per_table
1
SET @@global.innodb_file_per_table ='Off' ;
SELECT @@global.innodb_file_per_table;
@@global.innodb_file_per_table
0
SET @@global.innodb_file_per_table = 1;
SELECT @@global.innodb_file_per_table;
@@global.innodb_file_per_table
1 1
1 Expected
'#---------------------BS_STVARS_028_03----------------------#' '#---------------------BS_STVARS_028_03----------------------#'
SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
...@@ -47,4 +63,7 @@ COUNT(@@GLOBAL.innodb_file_per_table) ...@@ -47,4 +63,7 @@ COUNT(@@GLOBAL.innodb_file_per_table)
1 Expected 1 Expected
SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table; SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table;
ERROR 42S22: Unknown column 'innodb_file_per_table' in 'field list' ERROR 42S22: Unknown column 'innodb_file_per_table' in 'field list'
Expected error 'Readonly variable' SET @@global.innodb_file_per_table = @start_global_value;
SELECT @@global.innodb_file_per_table;
@@global.innodb_file_per_table
0
mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
View file @ e75f0e71
SET @start_global_value=@@global.innodb_lock_wait_timeout;
SELECT @start_global_value;
@start_global_value
50
'#---------------------BS_STVARS_032_01----------------------#' '#---------------------BS_STVARS_032_01----------------------#'
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
COUNT(@@GLOBAL.innodb_lock_wait_timeout) COUNT(@@GLOBAL.innodb_lock_wait_timeout)
1 1
1 Expected 1 Expected
'#---------------------BS_STVARS_032_02----------------------#' '#---------------------BS_STVARS_032_02----------------------#'
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); SET global innodb_lock_wait_timeout=60;
COUNT(@@GLOBAL.innodb_lock_wait_timeout) SELECT @@global.innodb_lock_wait_timeout;
1 @@global.innodb_lock_wait_timeout
1 Expected 60
SET session innodb_lock_wait_timeout=60;
SELECT @@session.innodb_lock_wait_timeout;
@@session.innodb_lock_wait_timeout
60
'#---------------------BS_STVARS_032_03----------------------#' '#---------------------BS_STVARS_032_03----------------------#'
SELECT @@GLOBAL.innodb_lock_wait_timeout = VARIABLE_VALUE SELECT @@GLOBAL.innodb_lock_wait_timeout = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
...@@ -47,4 +55,7 @@ COUNT(@@GLOBAL.innodb_lock_wait_timeout) ...@@ -47,4 +55,7 @@ COUNT(@@GLOBAL.innodb_lock_wait_timeout)
1 Expected 1 Expected
SELECT innodb_lock_wait_timeout = @@SESSION.innodb_lock_wait_timeout; SELECT innodb_lock_wait_timeout = @@SESSION.innodb_lock_wait_timeout;
ERROR 42S22: Unknown column 'innodb_lock_wait_timeout' in 'field list' ERROR 42S22: Unknown column 'innodb_lock_wait_timeout' in 'field list'
Expected error 'Readonly variable' SET @@global.innodb_lock_wait_timeout = @start_global_value;
SELECT @@global.innodb_lock_wait_timeout;
@@global.innodb_lock_wait_timeout
50
mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test
View file @ e75f0e71
################# mysql-test\t\innodb_autoinc_lock_mode_basic.test ############ ################# mysql-test\t\innodb_autoinc_lock_mode_basic.test ############
# # # #
# Variable Name: innodb_autoinc_lock_mode # # Variable Name: innodb_autoinc_lock_mode #
# Scope: GLOBAL # # Access Type: Static #
# Access Type: Dynamic #
# Data Type: Numeric # # Data Type: Numeric #
# Default Value: 1 # # Default Value: 1 #
# Range: 0,1,2 # # Range: 0,1,2 #
......
mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
View file @ e75f0e71
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
# Variable Name: innodb_fast_shutdown # # Variable Name: innodb_fast_shutdown #
# Scope: GLOBAL # # Scope: GLOBAL #
# Access Type: Dynamic # # Access Type: Dynamic #
# Data Type: boolean # # Data Type: numeric #
# Default Value: 1 # # Default Value: 1 #
# Valid Values: 0,1 # # Valid Values: 0,1,2 #
# # # #
# # # #
# Creation Date: 2008-02-20 # # Creation Date: 2008-02-20 #
......
mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
View file @ e75f0e71
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# # # #
# Variable Name: innodb_file_per_table # # Variable Name: innodb_file_per_table #
# Scope: Global # # Scope: Global #
# Access Type: Static # # Access Type: Dynamic #
# Data Type: boolean # # Data Type: boolean #
# # # #
# # # #
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
--source include/have_innodb.inc --source include/have_innodb.inc
SET @start_global_value = @@global.innodb_file_per_table;
SELECT @start_global_value;
--echo '#---------------------BS_STVARS_028_01----------------------#' --echo '#---------------------BS_STVARS_028_01----------------------#'
#################################################################### ####################################################################
# Displaying default value # # Displaying default value #
...@@ -37,11 +41,17 @@ SELECT COUNT(@@GLOBAL.innodb_file_per_table); ...@@ -37,11 +41,17 @@ SELECT COUNT(@@GLOBAL.innodb_file_per_table);
# Check if Value can set # # Check if Value can set #
#################################################################### ####################################################################
SELECT COUNT(@@GLOBAL.innodb_file_per_table); SET @@global.innodb_file_per_table = 0;
--echo 1 Expected SELECT @@global.innodb_file_per_table;
SET @@global.innodb_file_per_table ='On' ;
SELECT @@global.innodb_file_per_table;
SET @@global.innodb_file_per_table ='Off' ;
SELECT @@global.innodb_file_per_table;
SET @@global.innodb_file_per_table = 1;
SELECT @@global.innodb_file_per_table;
--echo '#---------------------BS_STVARS_028_03----------------------#' --echo '#---------------------BS_STVARS_028_03----------------------#'
################################################################# #################################################################
...@@ -93,6 +103,10 @@ SELECT COUNT(@@GLOBAL.innodb_file_per_table); ...@@ -93,6 +103,10 @@ SELECT COUNT(@@GLOBAL.innodb_file_per_table);
--Error ER_BAD_FIELD_ERROR --Error ER_BAD_FIELD_ERROR
SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table; SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table;
--echo Expected error 'Readonly variable'
#
# Cleanup
#
SET @@global.innodb_file_per_table = @start_global_value;
SELECT @@global.innodb_file_per_table;
mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
View file @ e75f0e71
...@@ -54,5 +54,9 @@ select * from information_schema.global_variables where variable_name='innodb_io ...@@ -54,5 +54,9 @@ select * from information_schema.global_variables where variable_name='innodb_io
set global innodb_io_capacity=100; set global innodb_io_capacity=100;
select @@global.innodb_io_capacity; select @@global.innodb_io_capacity;
#
# cleanup
#
SET @@global.innodb_io_capacity = @start_global_value; SET @@global.innodb_io_capacity = @start_global_value;
SELECT @@global.innodb_io_capacity; SELECT @@global.innodb_io_capacity;
mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test
View file @ e75f0e71
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
################## mysql-test\t\innodb_lock_wait_timeout_basic.test ########### ################## mysql-test\t\innodb_lock_wait_timeout_basic.test ###########
# # # #
# Variable Name: innodb_lock_wait_timeout # # Variable Name: innodb_lock_wait_timeout #
# Scope: Global # # Scope: Global , Session #
# Access Type: Static # # Access Type: Dynamic #
# Data Type: numeric # # Data Type: numeric #
# # # #
# # # #
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
--source include/have_innodb.inc --source include/have_innodb.inc
SET @start_global_value=@@global.innodb_lock_wait_timeout;
SELECT @start_global_value;
--echo '#---------------------BS_STVARS_032_01----------------------#' --echo '#---------------------BS_STVARS_032_01----------------------#'
#################################################################### ####################################################################
# Displaying default value # # Displaying default value #
...@@ -37,11 +40,10 @@ SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); ...@@ -37,11 +40,10 @@ SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
# Check if Value can set # # Check if Value can set #
#################################################################### ####################################################################
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); SET global innodb_lock_wait_timeout=60;
--echo 1 Expected SELECT @@global.innodb_lock_wait_timeout;
SET session innodb_lock_wait_timeout=60;
SELECT @@session.innodb_lock_wait_timeout;
--echo '#---------------------BS_STVARS_032_03----------------------#' --echo '#---------------------BS_STVARS_032_03----------------------#'
################################################################# #################################################################
...@@ -89,6 +91,10 @@ SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); ...@@ -89,6 +91,10 @@ SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
--Error ER_BAD_FIELD_ERROR --Error ER_BAD_FIELD_ERROR
SELECT innodb_lock_wait_timeout = @@SESSION.innodb_lock_wait_timeout; SELECT innodb_lock_wait_timeout = @@SESSION.innodb_lock_wait_timeout;
--echo Expected error 'Readonly variable'
#
# Cleanup
#
SET @@global.innodb_lock_wait_timeout = @start_global_value;
SELECT @@global.innodb_lock_wait_timeout;
mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test
View file @ e75f0e71
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# Scope: GLOBAL # # Scope: GLOBAL #
# Access Type: Dynamic # # Access Type: Dynamic #
# Data Type: Numeric # # Data Type: Numeric #
# Default Value: 90 # # Default Value: 75 #
# Range: 0-1000 # # Range: 0-99 #
# # # #
# # # #
# Creation Date: 2008-02-07 # # Creation Date: 2008-02-07 #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7