Bjorn Munch
affe300a48
merge from 5.1 main
2009-03-07 20:42:11 +01:00
Bjorn Munch
6dbc7df463
merge 42797
2009-03-04 16:41:45 +01:00
Bjorn Munch
7c1ea06e63
Bug #42986 MTR2 should not allow 0 as a value for --parallel
...
Add sanity check that $opt_parallel > 0
2009-03-04 12:12:57 +01:00
Bjorn Munch
23b7f4e4b2
Bug #43132 Pusbbuild 2 host sol10 sparc64 max is not running tests due to port unavailble
...
MTR gives up if wanted port not available
Try next range if set to 'auto'
Also, use next number for additional threads if explicitly set
2009-03-04 11:34:47 +01:00
kent.boortz@sun.com
09e0633f70
Merge from mysql-5.1.32-release
2009-03-02 17:47:03 +01:00
Bjorn Munch
0314eb7e40
Bug #40978 Error log gets truncated during testsuite, prevents debugging
...
Error log gets truncated when mysqld is restarted by MTR
2009-03-02 13:48:35 +01:00
Joerg Bruehe
eacedc8a99
Merge main 5.1 into 5.1-build
2009-02-28 17:35:00 +01:00
Bjorn Munch
a892ad5c62
Bug #43256 Bug#39026 got re-surrected
...
Problems with use of share/mysql dir
Explicitly look for "english" language file
2009-02-27 13:07:01 +01:00
Magnus Svensson
00e09900e9
Merge
2009-02-26 11:22:13 +01:00
Bjorn Munch
7627d3a107
merge
2009-02-25 11:42:34 +01:00
Bjorn Munch
72273a6572
fixing bzr tree name
2009-02-25 11:29:50 +01:00
Bjorn Munch
0f33682fa4
Bug #43172 MTR leaves test files in /tmp after check_socket_path_length finds path too long
...
Faulty logic in cleanup
Put test file into tmpdir, cleanup by removing tmpdir
2009-02-25 10:32:13 +01:00
Lars.Heill@Sun.COM
0d67e29dd2
Only specify the current year for the Sun product copyright
2009-02-24 19:09:22 +01:00
kent.boortz@sun.com
4f11a82b5c
Insert current year as last copyright year for the product
...
Don't use both "License" and "license" as RPM macro, they are the same
2009-02-24 17:54:03 +01:00
Magnus Svensson
2a001d9cc4
Bug#43112 mtr.pl --embedded fails to stop cluster processes
2009-02-23 15:52:23 +01:00
kent.boortz@sun.com
a6c1702321
Disabled libedit use of '__weak_reference' on FreeBSD, doesn't compile
2009-02-14 01:43:21 +01:00
MySQL Build Team
e81cf9ab6b
Added to source package the file "mysql-test/suite/bugs/combinations"
...
and the directory "mysql-test/suite/jp/include"
2009-02-13 10:42:27 +01:00
magnus.svensson@sun.com
7a4046988d
Work around for bug in some versions of the File::Temp Perl module
2009-02-13 10:38:53 +01:00
jperkin@sun.com
5caead0119
More portability fixes.
2009-02-12 16:01:38 +01:00
kent.boortz@sun.com
8daaad027f
Exclude libedit inclusion of <sys/ttydefaults.h> on AIX as well
2009-02-12 03:31:31 +01:00
kent.boortz@sun.com
1d4e64ea07
Changed to use the correct "__sun" and "__hpux" predefined
...
preprocessor symbols in libedit
2009-02-11 21:33:46 +01:00
kent.boortz@sun.com
1f18af1acb
Raise version number after cloning 5.1.32
2009-02-11 14:58:50 +01:00
Georgi Kodinov
e66ad2e8c6
merged 5.0-bugteam -> 5.1-bugteam
2009-02-11 12:07:22 +02:00
Georgi Kodinov
2a76e41836
merged 5.1-main -> 5.1-bugteam
2009-02-11 12:05:06 +02:00
Georgi Kodinov
f0dc3a92d5
changed the tree id pending a merge of 5.0-bugteam -> 5.0-main
2009-02-11 12:04:40 +02:00
Mats Kindahl
9bc8c703bc
Merging with 5.1-bugteam
2009-02-10 22:39:59 +01:00
Mats Kindahl
aa7bf83a2f
Bug #36763
...
TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.
Correcting some tests that was failing in pushbuild as well as fixing result
file for some tests that are not executed in the default MTR run.
2009-02-10 22:26:37 +01:00
Georgi Kodinov
bf63b815fa
merged 5.0-bugteam to 5.1-bugteam
2009-02-10 20:22:34 +02:00
Georgi Kodinov
1a7b0ec920
fixed a libedit compilation problem
2009-02-10 20:19:03 +02:00
Mats Kindahl
e3f51580d7
Merging with 5.1-bugteam
2009-02-10 16:13:44 +01:00
Mats Kindahl
de59bcbd32
BUG#36763: TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.
...
Post-merge fixes. Changes to some result sets.
2009-02-10 15:44:58 +01:00
Georgi Kodinov
6387fe92ea
merged 5.0-bugteam -> 5.1-bugteam
2009-02-10 16:26:18 +02:00
Georgi Kodinov
773b18e69a
From jperkin : Merge libedit 2.11 and related files,
...
based on NetBSD CVS as of 2009/02/06 20:09:00.
2009-02-10 14:39:14 +02:00
Bjorn Munch
b6ece6aafa
Bug #42590 MTR v1 crashes under Active State Perl
...
Perl crashes when MTR 2 tries to start v1
Replaced require with system()
2009-02-10 11:00:16 +01:00
Davi Arnaut
9bf6c85d81
Post-merge fix: Complete reversal of bug 33699.
2009-02-10 01:00:11 -02:00
Mats Kindahl
cb73100105
Merging with 5.1-bugteam.
2009-02-09 23:51:59 +01:00
Davi Arnaut
5f119f2825
Merge 5.1-bugteam into main.
2009-02-09 19:41:02 -02:00
Davi Arnaut
a8c57f9a03
Merge from upstream 5.1-bugteam.
2009-02-09 16:27:45 -02:00
Davi Arnaut
33a36ce9e7
Bug#42634: % character in query can cause mysqld signal 11 segfault
...
The problem is that a unfiltered user query was being passed as
the format string parameter of sql_print_warning which later
performs printf-like formatting, leading to crashes if the user
query contains formatting instructions (ie: %s). Also, it was
using THD::query as the source of the user query, but this
variable is not meaningful in some situations -- in a delayed
insert, it points to the table name.
The solution is to pass the user query as a parameter for the
format string and use the function parameter query_arg as the
source of the user query.
2009-02-09 16:17:58 -02:00
Sergey Glukhov
53eed773e3
Bug#42610 Dynamic plugin broken in 5.1.31
...
added ignore-builtin-innodb option which disabled
initialization of builtin InnoDB plugin
2009-02-09 19:03:52 +04:00
Vladislav Vaintroub
7a6c62c4ff
Bug#42427 : MTR v2 fails with "can't write to /tmp/mysql-test-ports.sem" on Windows
...
- /tmp directory is not guaranteed to exist on Windows.
Use the value of environment variable TEMP here
2009-02-09 13:10:34 +01:00
Timothy Smith
2515ce79e8
Auto-merge up from 5.0
2009-02-07 16:50:31 +01:00
Timothy Smith
401a83cac3
Auto-merge 5.1-build -> 5.1-bugteam
2009-02-07 16:29:37 +01:00
Timothy Smith
67bd15a554
Auto-merge 5.0-build -> 5.0-bugteam
2009-02-07 16:24:16 +01:00
Joerg Bruehe
70216215d1
Merge main 5.0 -> 5.0-build
2009-02-07 09:42:51 +01:00
9969fbff70
Raise version number after cloning 5.0.78
2009-02-07 05:47:21 +01:00
Joerg Bruehe
092e0eb5d0
Merge main 5.0 into 5.0-build
2009-02-06 21:58:08 +01:00
Joerg Bruehe
d79be5781c
Final merge of 5.0.72sp1 into 5.0-build
...
This involves just the tag, no file changes - they were all present before.
2009-02-06 21:25:04 +01:00
Timothy Smith
072a0bafd6
Auto merge fix for Bug 42525 from 5.0-bugteam
2009-02-06 19:38:39 +01:00
Tatiana A. Nurnberg
8cb7c9030f
auto-merge
2009-02-06 18:47:54 +01:00
