Bjorn Munch
0aa948dcd1
upmerge 50414
2010-02-03 10:25:53 +01:00
unknown
6a402e7c7a
Bug #50414 valgrind warnings: invalid file descriptor -1 in syscall
...
write()/read()
Sometimes stop/restart master or stop/restart salve can cause
network error, which can cause the 'invalid file descriptor
-1 in syscall write()/read()' warnings. All involved test
cases except rpl_slave_load_remove_tmpfile belong to the
kind of network error. So they are expected.
The 'rpl_slave_load_remove_tmpfile' belongs to file error,
but it is testing the file error as following code:
DBUG_EXECUTE_IF("remove_slave_load_file_before_write",
my_close(fd,MYF(0)); fd= -1; my_delete(fname, MYF(0)););
So it's expected too.
To fix the problem, add the valgrind warnings to the global
suppression list to suppress it.
mysql-test/include/mtr_warnings.sql:
Added code to suppress valgrind warnings: invalid file
descriptor -1 in syscall write()/read().
2010-02-03 15:49:20 +08:00
Bjorn Munch
62f370344c
dummy upmerge
2010-01-29 09:35:01 +01:00
Bjorn Munch
235e7b8f11
merge 49210
2010-01-28 15:19:18 +01:00
Bjorn Munch
480054c64d
upmerge 49210
2010-01-28 13:01:01 +01:00
Bjorn Munch
e6f532f695
upmerge 50182, 50540
2010-01-25 11:24:22 +01:00
Bjorn Munch
e8a05b4140
Bug #50182 mtr: allow $MTR_PORT_BASE or --port-base= as alternative to MTR_BUILD_THREAD
...
As suggested, convert internally to value of build_thread
2010-01-25 11:20:52 +01:00
Bernd Ocklin
e371d96a78
fix LD_LIBRARY_PATH (bug#50540)
2010-01-22 14:12:17 +01:00
Bjorn Munch
33fde0c025
upmerge 43005,48888,49837,49878,50471
2010-01-20 14:37:48 +01:00
Bjorn Munch
84616df3ff
merge 49837
2010-01-20 14:23:57 +01:00
Bjorn Munch
87ff57cb7e
merge 48888
2010-01-20 14:22:34 +01:00
Bjorn Munch
a1c9405354
merge 43005
2010-01-20 14:20:53 +01:00
Bjorn Munch
94ccc34537
Bug #49878 delimiter under false 'if' makes mysqltest test fail with 'Missing end of block'
...
delimiter not executed so does not recognize end of block
Always execute delimiter command, revert after false if() block.
2010-01-20 14:18:27 +01:00
Bernd Ocklin
75e9a54a53
exporting server version and other as env var (bug#50471)
2010-01-20 12:54:55 +01:00
Bjorn Munch
b554f4c52d
Bug #48888 mysqltest crashes on --replace_result if 'from' is longer than ~1024 symbols
...
valgrind pointed to a buffer allocated by my_realloc which looked fishy
Replaced size with what was probably intended, added test case.
Now also fixed line after review comment
2010-01-20 12:52:35 +01:00
Bjorn Munch
5ae2eda776
Bug #49837 mysqltest exec cannot handle multi-line command correctly
...
Since the exec command line is passed on externally, it cannot take newlines
Simply replace \n with space
Now also added test case
2010-01-20 12:51:18 +01:00
Bjorn Munch
9ff20f55bd
Bug#43005 main.init_connect fails on Windows due to wrong quoting of args
...
- The arguments are properly quoted when mtr.pl calls my_safe_process but
unfortunately the all off when running with active state perl and stays
in cygwin perl.
- Extend the patch to only quote args that are not already quoted
This a redo of previous commit, will be included in next push
2010-01-19 09:48:56 +01:00
Bjorn Munch
8c9637471b
backport some changes from WL 4378
2010-01-07 13:19:09 +01:00
Bjorn Munch
9ada265d39
backport some changes from WL 4378
2010-01-07 13:17:54 +01:00
Bjorn Munch
73c93ea34c
upmerge 49269 amendment
2010-01-07 11:27:00 +01:00
Bjorn Munch
e1b42965a5
Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
...
Undid amendment allowing pending reap after switching connections
Moved check for pending reap earlier; failed if running with ps-protocol
2010-01-07 11:22:45 +01:00
Bjorn Munch
b7c0557005
upmerge 49269 amendment
2010-01-06 12:59:41 +01:00
Bjorn Munch
ed64190b23
Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
...
Small amendment: ignore pending reap when switching connection, add test
2010-01-06 12:56:22 +01:00
Bjorn Munch
7ab9cbe3c3
merge 48863,49269,49345,49672,49761
2010-01-06 09:57:44 +01:00
Bjorn Munch
90b24e992e
merge 49345
2010-01-06 09:54:43 +01:00
Bjorn Munch
d3c57be834
merge 49672
2010-01-06 09:52:55 +01:00
Bjorn Munch
04a5dcb136
Bug #49761 mysqltest.test does not have any tests for send/reap
...
Added them
NB the 6th case is adapted to Bug no. 49269, gives wrong output without it
2010-01-06 09:47:25 +01:00
Bjorn Munch
08c8863ec4
Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
...
Set a flag after send to trap the case
2010-01-06 09:45:28 +01:00
Bjorn Munch
5b66dab00f
Bug #48863 mysql test: enable and disable case insensitive compare mode
...
Implemented --lowercase_result which lower cases next result
2010-01-06 09:42:21 +01:00
Bjorn Munch
ce019a2fac
Bug #49345 re-introduce gprof to mysql-test-run.pl
...
Was available in v1
Porting to v2 required some rewriting
Updated after review comments
2010-01-05 21:35:50 +01:00
Bjorn Munch
d7ec36a1ba
silly upmerge of nothing after bzr mess-up
2010-01-05 13:35:22 +01:00
Bjorn Munch
4d8b228c8d
Bug #49166 mtr --combination is broken after restrictions of combination names
...
Combinations beginning with -- not allowed
Allow them...
2010-01-05 13:31:38 +01:00
Bjorn Munch
e48e1cf565
upmerge 49166
2010-01-05 13:13:16 +01:00
Bjorn Munch
04c39b1939
Bug #49166 mtr --combination is broken after restrictions of combination names
...
Combinations beginning with -- not allowed
Allow them...
2010-01-05 13:05:00 +01:00
Bjorn Munch
3a2574f403
merge from mysql-trunk
2010-01-04 13:50:48 +01:00
Alexander Nozdrin
0b74a91126
Postfix for Bug#37408 (fix for Bug#49898).
2009-12-24 10:10:05 +03:00
Alexander Nozdrin
5be5b55ff4
Fix default.conf.
2009-12-23 15:09:31 +03:00
Alexander Nozdrin
ba60b39ca3
Backporting fix for Bug#49834 from mysql-next-mr-bugfixing
...
into mysql-trunk-bugfixing.
Original revision:
------------------------------------------------------------
revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Tue 2009-12-22 12:53:11 +0100
message:
Bug#49834 - fixed a bug introduced by mismerge.
restore original innobase version
------------------------------------------------------------
2009-12-23 15:03:51 +03:00
Alexander Nozdrin
a987a27dc7
Auto-merge from mysql-trunk.
2009-12-23 13:41:55 +03:00
Vladislav Vaintroub
f415cd2911
merge
2009-12-22 22:05:04 +01:00
Vladislav Vaintroub
dcdaa8f4fc
Fix build error with CMake 2.8 (mysql_stmt_next_result not exported
...
by shared embedded library)
2009-12-22 21:49:37 +01:00
Alexander Nozdrin
f238adf75d
Manual merge from mysql-trunk.
...
Conflicts:
- storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:31:24 +03:00
Alexander Nozdrin
1f0ef431d1
Null-merge default.conf from mysql-trunk.
2009-12-21 18:40:26 +03:00
Alexander Nozdrin
23e70189ab
Fix default.conf.
2009-12-21 18:35:38 +03:00
Bjorn Munch
0cdedb0d8b
null upmerge
2009-12-21 12:58:48 +01:00
Bjorn Munch
6b367d98a7
merge from trunk
2009-12-21 12:56:39 +01:00
Bjorn Munch
6644ff11c5
merge from 5.1 again
2009-12-21 12:54:45 +01:00
Mattias Jonsson
287dfc1469
Bug#48737: Partitions: search fails with ucs2
...
Recommit of patch:
http://lists.mysql.com/commits/91400
Test case only (code part was pushes as bug-49028)
mysql-test/r/partition_column.result:
Bug#48737: Partitions: search fails with ucs2
added test case
mysql-test/t/partition_column.test:
Bug#48737: Partitions: search fails with ucs2
Added result
2009-12-21 11:38:31 +01:00
Alexander Nozdrin
c736665e43
Disable plugin_load.test due to Bug#42144.
2009-12-21 13:20:43 +03:00
Mikael Ronstrom
6bcd9edc8a
Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status
2009-12-19 13:26:00 +01:00