database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Auto-merge from mysql-next-mr.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-02-25 22:58:57 +03:00
parent a98481354e 49e7114fdb
commit accce6be6e
92 changed files with 1364 additions and 1345 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

2
mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result
View File

@@ -66,7 +66,7 @@ SET GLOBAL max_prepared_stmt_count=3;
** Creating procedure **
DROP PROCEDURE IF EXISTS sp_checkstmts;
Warnings:
Note 1305 PROCEDURE sp_checkstmts does not exist
Note 1305 PROCEDURE test.sp_checkstmts does not exist
CREATE PROCEDURE sp_checkstmts ()
BEGIN
PREPARE newstmt from "SELECT * FROM information_schema.CHARACTER_SETS C";

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