mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sita.local:/Users/tsmith/m/bk/maint/50

Browse source 
into  sita.local:/Users/tsmith/m/bk/maint/51
This commit is contained in:
tsmith@sita.local 2007-09-24 13:31:39 +02:00
commit ec39c6d6e4
9 changed files with 4348 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/include/windows.inc
View file

@ -1,4 +1,5 @@
--require r/windows.require
disable_query_log;
select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE";
enable_query_log;
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`)
{
skip Need windows;
}

2153
mysql-test/r/named_pipe.result Normal file
View file

File diff suppressed because it is too large Load diff

2155
mysql-test/r/shm.result Normal file
View file

File diff suppressed because it is too large Load diff

2
mysql-test/r/windows_shm.result
View file

@ -1,2 +0,0 @@
mysqld is alive
End of 5.0 tests.

1
mysql-test/t/named_pipe-master.opt Normal file
View file

@ -0,0 +1 @@
--loose-enable-named-pipe

14
mysql-test/t/named_pipe.test Normal file
View file

@ -0,0 +1,14 @@
# We currently only have named pipe support on windows, so
# in order to optimize things we skip this test on all
# other platforms
--source include/windows.inc
# Only run this test if named pipe is avaliable
let $nmp= query_get_value("SHOW VARIABLES LIKE 'named_pipe'", Value, 1);
if (`SELECT '$nmp' != 'ON'`){
skip No named pipe support;
}
# Source select test case
-- source include/common-tests.inc

2
mysql-test/t/windows_shm-master.opt → mysql-test/t/shm-master.opt
View file

@ -1 +1 @@
--skip-grant-tables --loose-shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --loose-shared-memory=1
--skip-grant-tables --loose-shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX$MTR_BUILD_THREAD --loose-shared-memory=1

19
mysql-test/t/shm.test Normal file
View file

@ -0,0 +1,19 @@
# We currently only have shm support on windows, so in order
# to optimize things we skip this test on all other platforms
--source include/windows.inc
# Only run this test if shared memory is avaliable
let $shm= query_get_value("SHOW VARIABLES LIKE 'shared_memory'", Value, 1);
if (`SELECT '$shm' != 'ON'`){
skip No shm support;
}
# Source select test case
-- source include/common-tests.inc
#
# Bug #24924: shared-memory-base-name that is too long causes buffer overflow
#
--exec $MYSQLADMIN --no-defaults --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ping
--echo End of 5.0 tests.

9
mysql-test/t/windows_shm.test
View file

@ -1,9 +0,0 @@
# Windows-specific tests
--source include/windows.inc
#
# Bug #24924: shared-memory-base-name that is too long causes buffer overflow
#
--exec $MYSQLADMIN --no-defaults --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ping
--echo End of 5.0 tests.