database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Cleanup after push of

Browse Source 
WL#5154 - Remove deprecated 4.1 features

The fix is the removal of the sql_log_update_basic
test, as this option is deprecated and removed,
and a minor change to the result file of
lc_time_names_basic as the error message has
changed.
This commit is contained in:
Magne Mahre
2010-02-18 18:10:39 +01:00
parent b0cdcdcbb9
commit 2da4521fb8
3 changed files with 2 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/sys_vars/r/lc_time_names_basic.result
View File

@ -460,7 +460,7 @@ SELECT @@session.lc_time_names;
sq_AL
SET @@session.lc_time_names=sr_YU;
Warnings:
Warning 1287 'sr_YU' is deprecated; use 'sr_RS' instead
Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead
SELECT @@session.lc_time_names;
@@session.lc_time_names
sr_RS
@ -907,7 +907,7 @@ SELECT @@global.lc_time_names;
sq_AL
SET @@global.lc_time_names=sr_YU;
Warnings:
Warning 1287 'sr_YU' is deprecated; use 'sr_RS' instead
Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead
SELECT @@global.lc_time_names;
@@global.lc_time_names
sr_RS

82
mysql-test/suite/sys_vars/r/sql_log_update_basic.result
View File

@ -1,82 +0,0 @@
SET @start_global_value = @@global.sql_log_update;
SELECT @start_global_value;
@start_global_value
1
select @@global.sql_log_update;
@@global.sql_log_update
1
select @@session.sql_log_update;
@@session.sql_log_update
1
show global variables like 'sql_log_update';
Variable_name Value
sql_log_update ON
show session variables like 'sql_log_update';
Variable_name Value
sql_log_update ON
select * from information_schema.global_variables where variable_name='sql_log_update';
VARIABLE_NAME VARIABLE_VALUE
SQL_LOG_UPDATE ON
select * from information_schema.session_variables where variable_name='sql_log_update';
VARIABLE_NAME VARIABLE_VALUE
SQL_LOG_UPDATE ON
set global sql_log_update=1;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
set session sql_log_update=ON;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
select @@global.sql_log_update;
@@global.sql_log_update
1
select @@session.sql_log_update;
@@session.sql_log_update
1
show global variables like 'sql_log_update';
Variable_name Value
sql_log_update ON
show session variables like 'sql_log_update';
Variable_name Value
sql_log_update ON
select * from information_schema.global_variables where variable_name='sql_log_update';
VARIABLE_NAME VARIABLE_VALUE
SQL_LOG_UPDATE ON
select * from information_schema.session_variables where variable_name='sql_log_update';
VARIABLE_NAME VARIABLE_VALUE
SQL_LOG_UPDATE ON
set global sql_log_update=0;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
set session sql_log_update=OFF;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
select @@global.sql_log_update;
@@global.sql_log_update
0
select @@session.sql_log_update;
@@session.sql_log_update
0
show global variables like 'sql_log_update';
Variable_name Value
sql_log_update OFF
show session variables like 'sql_log_update';
Variable_name Value
sql_log_update OFF
select * from information_schema.global_variables where variable_name='sql_log_update';
VARIABLE_NAME VARIABLE_VALUE
SQL_LOG_UPDATE OFF
select * from information_schema.session_variables where variable_name='sql_log_update';
VARIABLE_NAME VARIABLE_VALUE
SQL_LOG_UPDATE OFF
set global sql_log_update=1.1;
ERROR 42000: Incorrect argument type to variable 'sql_log_update'
set global sql_log_update=1e1;
ERROR 42000: Incorrect argument type to variable 'sql_log_update'
set global sql_log_update="foo";
ERROR 42000: Variable 'sql_log_update' can't be set to the value of 'foo'
SET @@global.sql_log_update = @start_global_value;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
SELECT @@global.sql_log_update;
@@global.sql_log_update
1

53
mysql-test/suite/sys_vars/t/sql_log_update_basic.test
View File

@ -1,53 +0,0 @@
#
# 2010-01-20 OBN - Added check of I_S tables after variable value changes.
# - Added value change to ON/OFF to ensure change of current value
#
--source include/have_profiling.inc
SET @start_global_value = @@global.sql_log_update;
SELECT @start_global_value;
#
# exists as global and session
#
select @@global.sql_log_update;
select @@session.sql_log_update;
show global variables like 'sql_log_update';
show session variables like 'sql_log_update';
select * from information_schema.global_variables where variable_name='sql_log_update';
select * from information_schema.session_variables where variable_name='sql_log_update';
#
# show that it's writable
#
set global sql_log_update=1;
set session sql_log_update=ON;
select @@global.sql_log_update;
select @@session.sql_log_update;
show global variables like 'sql_log_update';
show session variables like 'sql_log_update';
select * from information_schema.global_variables where variable_name='sql_log_update';
select * from information_schema.session_variables where variable_name='sql_log_update';
set global sql_log_update=0;
set session sql_log_update=OFF;
select @@global.sql_log_update;
select @@session.sql_log_update;
show global variables like 'sql_log_update';
show session variables like 'sql_log_update';
select * from information_schema.global_variables where variable_name='sql_log_update';
select * from information_schema.session_variables where variable_name='sql_log_update';
#
# incorrect types
#
--error ER_WRONG_TYPE_FOR_VAR
set global sql_log_update=1.1;
--error ER_WRONG_TYPE_FOR_VAR
set global sql_log_update=1e1;
--error ER_WRONG_VALUE_FOR_VAR
set global sql_log_update="foo";
SET @@global.sql_log_update = @start_global_value;
SELECT @@global.sql_log_update;