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

fixed various pb2 test failures on windows.

Browse Source
This commit is contained in:
Georgi Kodinov 2010-02-02 14:17:21 +02:00
parent 9b75c2f268
commit 1dafac6f35
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/bug46080.result Normal file → Executable file
View File

@ -2,8 +2,8 @@
# Bug #46080: group_concat(... order by) crashes server when # Bug #46080: group_concat(... order by) crashes server when
# sort_buffer_size cannot allocate # sort_buffer_size cannot allocate
# #
call mtr.add_suppression("Out of memory at line .*, 'my_alloc.c'"); call mtr.add_suppression("Out of memory at line .*, '.*my_alloc.c'");
call mtr.add_suppression("needed .* byte .*k., memory in use: .* bytes .*k"); call mtr.add_suppression("needed .* byte (.*k)., memory in use: .* bytes (.*k)");
CREATE TABLE t1(a CHAR(255)); CREATE TABLE t1(a CHAR(255));
INSERT INTO t1 VALUES ('a'); INSERT INTO t1 VALUES ('a');
SET @@SESSION.sort_buffer_size=5*16*1000000; SET @@SESSION.sort_buffer_size=5*16*1000000;

4
mysql-test/t/bug46080.test
View File

@ -3,8 +3,8 @@
--echo # sort_buffer_size cannot allocate --echo # sort_buffer_size cannot allocate
--echo # --echo #
call mtr.add_suppression("Out of memory at line .*, 'my_alloc.c'"); call mtr.add_suppression("Out of memory at line .*, '.*my_alloc.c'");
call mtr.add_suppression("needed .* byte .*k., memory in use: .* bytes .*k"); call mtr.add_suppression("needed .* byte (.*k)., memory in use: .* bytes (.*k)");
CREATE TABLE t1(a CHAR(255)); CREATE TABLE t1(a CHAR(255));
INSERT INTO t1 VALUES ('a'); INSERT INTO t1 VALUES ('a');

3
sql/event_scheduler.cc Normal file → Executable file
View File

@ -235,8 +235,9 @@ event_scheduler_thread(void *arg)
if (!res) if (!res)
scheduler->run(thd); scheduler->run(thd);
DBUG_LEAVE; // Against gcc warnings
my_thread_end(); my_thread_end();
DBUG_RETURN(0); // Against gcc warnings return 0;
} }