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

Bug#28234 - global/session scope - documentation vs implementation

Browse Source 
Post-pushbuild fix.

- Windows does not have 'socket' system variable.
- Compiler warning in sql/slave.cc
This commit is contained in:
Ingo Struewing
2008-11-27 11:50:28 +01:00
parent 35bebf503f
commit b903835265
3 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/r/variables.result
View File

@ -1325,19 +1325,6 @@ ERROR HY000: Variable 'skip_show_database' is a read only variable
SET @@global.skip_show_database= true; SET @@global.skip_show_database= true;
ERROR HY000: Variable 'skip_show_database' is a read only variable ERROR HY000: Variable 'skip_show_database' is a read only variable
# #
SHOW VARIABLES like 'socket';
Variable_name Value
socket #
SELECT @@session.socket;
ERROR HY000: Variable 'socket' is a GLOBAL variable
SELECT @@global.socket;
@@global.socket
#
SET @@session.socket= 'x';
ERROR HY000: Variable 'socket' is a read only variable
SET @@global.socket= 'x';
ERROR HY000: Variable 'socket' is a read only variable
#
SHOW VARIABLES like 'thread_stack'; SHOW VARIABLES like 'thread_stack';
Variable_name Value Variable_name Value
thread_stack # thread_stack #

12
mysql-test/t/variables.test
View File

@ -1067,18 +1067,6 @@ SET @@global.skip_show_database= true;
# #
--echo # --echo #
--replace_column 2 # --replace_column 2 #
SHOW VARIABLES like 'socket';
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.socket;
--replace_column 1 #
SELECT @@global.socket;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@session.socket= 'x';
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.socket= 'x';
#
--echo #
--replace_column 2 #
SHOW VARIABLES like 'thread_stack'; SHOW VARIABLES like 'thread_stack';
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.thread_stack; SELECT @@session.thread_stack;

2
sql/slave.cc
View File

@ -288,7 +288,7 @@ static void print_slave_skip_errors(void)
10 characters must be sufficient for a number plus {',' | '...'} 10 characters must be sufficient for a number plus {',' | '...'}
plus a NUL terminator. That is a max 6 digit number. plus a NUL terminator. That is a max 6 digit number.
*/ */
const int MIN_ROOM= 10; const size_t MIN_ROOM= 10;
DBUG_ENTER("print_slave_skip_errors"); DBUG_ENTER("print_slave_skip_errors");
DBUG_ASSERT(sizeof(slave_skip_error_names) > MIN_ROOM); DBUG_ASSERT(sizeof(slave_skip_error_names) > MIN_ROOM);
DBUG_ASSERT(MAX_SLAVE_ERROR <= 999999); // 6 digits DBUG_ASSERT(MAX_SLAVE_ERROR <= 999999); // 6 digits