1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge to mysql-5.1-bugteam

Browse Source
This commit is contained in:
Satya B 2009-09-23 17:45:56 +05:30
commit e6afad8858
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/windows.result
View File

@ -53,3 +53,10 @@ ERROR HY000: No paths allowed for shared library
execute abc; execute abc;
ERROR HY000: No paths allowed for shared library ERROR HY000: No paths allowed for shared library
deallocate prepare abc; deallocate prepare abc;
#
# Bug#45498: Socket variable not available on Windows
#
SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME = 'socket';
VARIABLE_NAME
SOCKET

6
mysql-test/t/windows.test
View File

@ -92,3 +92,9 @@ execute abc;
execute abc; execute abc;
deallocate prepare abc; deallocate prepare abc;
--echo #
--echo # Bug#45498: Socket variable not available on Windows
--echo #
SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME = 'socket';

4
sql/set_var.cc
View File

@ -529,11 +529,11 @@ static sys_var_const sys_skip_networking(&vars, "skip_networking",
static sys_var_const sys_skip_show_database(&vars, "skip_show_database", static sys_var_const sys_skip_show_database(&vars, "skip_show_database",
OPT_GLOBAL, SHOW_BOOL, OPT_GLOBAL, SHOW_BOOL,
(uchar*) &opt_skip_show_db); (uchar*) &opt_skip_show_db);
#ifdef HAVE_SYS_UN_H
static sys_var_const sys_socket(&vars, "socket", static sys_var_const sys_socket(&vars, "socket",
OPT_GLOBAL, SHOW_CHAR_PTR, OPT_GLOBAL, SHOW_CHAR_PTR,
(uchar*) &mysqld_unix_port); (uchar*) &mysqld_unix_port);
#endif
#ifdef HAVE_THR_SETCONCURRENCY #ifdef HAVE_THR_SETCONCURRENCY
/* purecov: begin tested */ /* purecov: begin tested */
static sys_var_const sys_thread_concurrency(&vars, "thread_concurrency", static sys_var_const sys_thread_concurrency(&vars, "thread_concurrency",