Magnus Svensson
bc22c992ef
Merge
2009-01-21 14:41:50 +01:00
He Zhenxing
43290f9935
Auto merge
2009-01-21 18:39:11 +08:00
He Zhenxing
1c2d6237f7
Auto merge
2009-01-21 18:28:51 +08:00
Magnus Svensson
56e6a0ab82
Bug#39972 mysql-test-run.pl: Confusing error message under special conditions
...
- Fix problem with for example ./mtr --timer, caused by new version of "Getopt::Long"
- Evaluating the "$opt" variable as a string, returns the name of the parameter
to be modified instead of "Getopt::Long::Callback" which is the class name
2009-01-21 11:17:16 +01:00
He Zhenxing
63256ef955
BUG#41653 rpl_innodb_bug30888 fails sporadically on pushbuild: warning in log
...
In mtr.check_warnings, `text` was declares as type text, which is
64K, and when the server log grows larger than this, it would be
truncated, and then check_warnings was actually checking the
error messages of a previous test and complain warnings.
This patch fixed the problem by change the type of `text` to
mediumtext, which is 16M.
2009-01-21 17:59:31 +08:00
Bjorn Munch
b5018400dc
merge
2009-01-21 10:57:31 +01:00
Bjorn Munch
8a0c984f01
Bug #40399 Please make mtr print stack trace after every failure
...
SIGABRT is sent to relevant processes after a timeout
2009-01-21 10:34:01 +01:00
He Zhenxing
65ca6ce37c
BUG#41177 mtr gives no debug info after failing to execute check-testcase/check-warnings
...
Log output of mysqltest when running check-testcase together
with errput. Remove --silent option for mysqltest when running
check-testcase/check-warnings
2009-01-21 17:32:05 +08:00
Staale Smedseng
e456ef4b8d
Adding a test to verify that Bug#27208 "If no current database,
...
character_set_database !=character_set_server" is fixed.
2009-01-20 16:59:20 +01:00
Bjorn Munch
9b79ce21cf
merge
2009-01-20 14:21:57 +01:00
Bjorn Munch
d734aa7827
Bug #41420 MTR fails on windows with "The symlink function is unimplemented"
...
Don't do the symlink if running on Windows
2009-01-20 11:40:10 +01:00
MySQL Build Team
47844077fd
Incorrect test if "--short-product-tag=" was given or not
2009-01-19 17:48:05 +01:00
MySQL Build Team
4915050033
Fixed typo
2009-01-17 09:29:40 +01:00
Timothy Smith
2389815aba
Add another cast to ignore int/ulong difference in error types, silence warning on Win64
2009-01-16 17:49:07 +01:00
Timothy Smith
932b6454f3
Auto merge
2009-01-16 17:47:09 +01:00
Timothy Smith
6770a687db
Auto-merge from upstream 5.1-bugteam
2009-01-16 17:33:24 +01:00
Georgi Kodinov
c34491360f
merged 5.0-bugteam -> 5.1-bugteam
2009-01-16 17:38:38 +02:00
Georgi Kodinov
7fc8286257
auto merge
2009-01-16 16:48:41 +02:00
MySQL Build Team
004a1396b6
Auto-merge
2009-01-16 15:04:11 +01:00
Georgi Kodinov
0d1a56de8e
merged 5.0-bugteam -> 5.1-bugteam
2009-01-16 13:42:01 +02:00
Georgi Kodinov
91ffe6edb7
merged 5.1-main -> 5.1-bugteam
2009-01-16 13:41:12 +02:00
Georgi Kodinov
23fac1b529
merged 5.0-main -> 5.0-bugteam
2009-01-16 13:19:42 +02:00
Georgi Kodinov
c31cc3f2f3
merged 5.1-main -> 5.1-bugteam
2009-01-16 12:47:48 +02:00
Georgi Kodinov
e5dd9c5a1d
merged 5.0-bugteam -> 5.1-bugtteam
2009-01-16 12:45:17 +02:00
MySQL Build Team
5681ceda02
Cherry-pick fix for bug#40386, "Not flushing query cache after truncate", out of 5.1-bugteam branch.
...
This fix is r3114 from innodb-5.1-ss3603.
2009-01-15 21:16:18 +01:00
MySQL Build Team
951d045231
Added option "--short-product-tag=<string>" to "make_binary_distribution.sh",
...
to enable product name and server suffix to differ.
2009-01-15 20:09:58 +01:00
Joerg Bruehe
4f0d2f5a03
Upmerge changesets from 5.0-build to 5.1-build.
...
This does not bring any contents changes, it is purely
metadata which are affected.
Details:
Even within 5.0, most of these changesets did not cause
file contents changes, because they were backports done
for the "service pack" builds of 5.0.66sp1 and 5.0.72sp1.
The "real" changesets are also already present in 5.1,
so this upmerge doesn't change any contents.
The only "real" changeset in 5.0 was a fix of the shell
scripts used to configure bdb (BerkeleyDB).
As we completele removed bdb from the 5.1 sources already,
the affected files are not present in the 5.1 source tree,
so this changeset also does not cause any contents changes.
2009-01-15 19:11:25 +01:00
Joerg Bruehe
4c4e4881f1
Again, the branch designation "-bugteam" made it to the main tree,
...
this should not happen.
2009-01-15 18:35:21 +01:00
Joerg Bruehe
731b0ca30a
Merge the version number increase.
2009-01-15 17:51:40 +01:00
Joerg Bruehe
29f6fb9699
Merge main tree to 5.1-build
2009-01-15 17:21:42 +01:00
kent.boortz@sun.com
5a1d0901e4
Raise version number after cloning 5.1.31
2009-01-15 16:48:10 +01:00
Georgi Kodinov
7a6dda5077
merged Bug 38795 to 5.0-bugteam
2009-01-15 16:15:38 +02:00
Davi Arnaut
cc95555fbc
Post-merge fix for Bug#36326
2009-01-15 11:38:49 -02:00
Alexander Nozdrin
b3fa22c26a
Bug#31222: adding missed file.
2009-01-15 14:58:32 +03:00
Joerg Bruehe
4ecaa45d11
Merge some tool fixes from the 5.0.72sp1 build back into the tree.
...
This is not the final merge of that release build, but we need early
access to these tool fixes (use of "awk" in the BDB configuration).
2009-01-15 12:08:09 +01:00
Joerg Bruehe
887126a9fb
Merge the changes of the 5.0.66sp1 build back into the tree.
2009-01-15 11:48:31 +01:00
Davi Arnaut
cf5dd72ee0
Merge from 5.0-bugteam
2009-01-15 08:28:10 -02:00
Alexander Nozdrin
50a8cdc6c8
Pull from 5.0-bugteam
2009-01-15 13:10:20 +03:00
Alexander Nozdrin
6dd7ac74dd
Merge backport of patch for Bug#31222 from 5.0 to 5.1
2009-01-15 12:56:05 +03:00
Davi Arnaut
080853635d
Auto-merge from 5.1-bugteam
2009-01-15 07:52:06 -02:00
Alexander Nozdrin
333aa975ec
Backport patch for Bug#31222 (com_% global status counters behave randomly
...
with mysql_change_user) to 5.0.
2009-01-15 12:36:34 +03:00
Magnus Svensson
37e91accb0
Bug#35701 please allow test language variables in connection and
...
sync_slave_with_master
- Additional patch for "disconnect $variable"
2009-01-15 09:05:51 +01:00
Georgi Kodinov
c5acb1258c
merge 5.0-bugteam-> 5.1-bugteam
2009-01-15 07:31:47 +02:00
Georgi Kodinov
1233360cc2
merge 5.0-main to 5.0-bugteam
2009-01-15 06:35:18 +02:00
MySQL Build Team
d535a2b92e
Oops, bumped version too high. Drop it back down from 5.0.78 to 5.0.77.
2009-01-15 00:14:07 +01:00
Ramil Kalimullin
2dba01b2fa
bug#33094: Error in upgrading from 5.0 to 5.1 when table contains triggers
...
Post-fix test failure: fixed mysqlcheck.test on Windows platforms.
2009-01-15 00:54:25 +04:00
timothy.smith@sun.com
10408c632d
Raise version number after cloning 5.0.76
2009-01-14 20:16:10 +01:00
Chad MILLER
0ba397e0b2
Merge from dev tree.
2009-01-14 11:15:11 -05:00
Chad MILLER
8c9e81e8af
Bug#38145: .frm file isn't sync'd with sync_frm enabled
...
Views weren't sync()d the same way other structures were.
In creating the FRM for views, obey the same rules for variable
"sync_frm" as for everything else.
2009-01-14 11:11:31 -05:00
Chad MILLER
6ab0034f5a
Fix comment. Boolean function returns true/false, not zero/one.
2009-01-14 11:10:36 -05:00
