Commit graph

54732 commits

Author SHA1 Message Date
Kristofer Pettersson
597fe73cb8 auto merge 2008-07-22 13:33:37 +02:00
Kristofer Pettersson
906f061c76 Disabled two test cases in 5.1 because of random failures. 2008-07-22 13:04:32 +02:00
Kristofer Pettersson
9d83bfb469 merge 5.1->5.1-bugteam 2008-07-22 12:56:36 +02:00
Kristofer Pettersson
25dd8b33d7 merge 5.0->5.0-bugteam 2008-07-22 12:55:15 +02:00
Kristofer Pettersson
de4d31f2ac 2008-07-22 12:41:55 +02:00
Tatiana A. Nurnberg
0fc2eeb67d auto-merge 2008-07-22 08:54:07 +02:00
Sven Sandberg
5ca789693b BUG#38269: pushbuild gives valgrind error in ha_statistic_increment for rpl_temporary
This does not fix the bug. It only disables the failing test.
2008-07-21 21:05:06 +02:00
Kristofer Pettersson
f5668bc865 Corrected merge misstake. 2008-07-21 16:41:17 +02:00
Kristofer Pettersson
3f332ceae5 Auto merge 2008-07-21 14:00:13 +02:00
Narayanan V
459480f81d WL#4380
Modified the abi_check command to ignore space
differences between the .pp and the .out files.
2008-07-21 16:09:08 +05:30
Kristofer Pettersson
df89855e70 Auto merge 2008-07-21 12:24:31 +02:00
Kristofer Pettersson
71930db28f Bug#37027 expire_logs_days and missing binlogs cause a crash !
If the server failed to expired log files during start up it could crash.
2008-07-24 14:28:21 +02:00
Sergei Golubchik
50e23ee8ee Bug#34409 LOCK_plugin contention via ha_release_temporary_latches/plugin_foreach
use thread-local data structures in ha_release_temporary_latches()
2008-07-21 12:01:22 +02:00
Tatiana A. Nurnberg
c990f5d378 auto-merge + post-merge fixies 2008-07-21 11:20:03 +02:00
Kristofer Pettersson
d8eb66127b Manual merge 2008-07-21 11:18:35 +02:00
Kristofer Pettersson
e443cafb09 Null merge 2008-07-24 15:41:55 +02:00
Timothy Smith
91d19a1bea Up-merge latest changes from 5.0-build 2008-07-20 22:01:25 -06:00
Timothy Smith
528b3105f5 Merge latest changes from 5.0-build 2008-07-20 21:59:47 -06:00
Timothy Smith
6e8eaa8e21 Up-merge of merges, some criss-cross resolved with --weave. 2008-07-19 02:31:33 -06:00
Timothy Smith
e6f3e65a3a Merge in changes from 5.0.66a (via mysql-5.0) 2008-07-18 21:48:18 -06:00
Timothy Smith
f44c3210ce Merge 5.0.66a-release changes 2008-07-18 21:46:03 -06:00
kent@mysql.com
18e0e280e4 Merge from mysql-5.0.66-release 2008-07-19 02:52:13 +02:00
Andrei Elkin
209e3395d2 merge 2008-07-18 17:02:42 +03:00
Narayanan V
bcbd5bc373 WL#4380
1) Modified abi_check rule to not write into the
   distribution directory.
2) Added the .pp files to EXTRA_DIST so that it will
   be included in the distribution
2008-07-18 19:21:54 +05:30
Sven Sandberg
38376746e3 BUG#38077: rpl_incident At line 22: query 'SELECT * ...' Table 'test.t1' doesn't exist
This is not a fix to the bug. It only adds debug info, so
that we can analyze the bug better next time it happens.
Please revert the patch after the bug is fixed.
2008-07-18 15:07:14 +02:00
Georgi Kodinov
38dcc057c2 merge of 38158 to 5.1-bugteam 2008-07-18 15:00:45 +03:00
Andrei Elkin
a5d1e6101e Bug #36818 rpl_server_id1 fails expecting slave has stopped
the reason for the failure is that io thread passes through a sequence of state
changes before it eventually got stuck at the expect running state as NO.
It's unreasonble to wait for the running status while the whole idea of the test is
to get to the IO thread error.

Fixed with changing the waiting condition.
2008-07-18 14:53:16 +03:00
Sven Sandberg
e5d1324d80 BUG#38178: rpl_loaddata_map fails sporadically in pushbuild
Problem: master binlog has 'create table t1'. Master binlog
was removed before slave could replicate it. In test's cleanup
code, master did 'drop table t1', which caused slave sql
thread to stop with an error since slave sql thread did not
know about t1.
Fix: t1 is just an auxiliary construction, only needed on
master. Hence, we turn off binlogging before t1 is created,
drop t1 as soon as we don't need it anymore, and then turn
on binlogging again.
2008-07-18 13:34:19 +02:00
Georgi Kodinov
5c256ec67a Bug 38158: mysql client regression, can't read dump files
- Revert the fix for bug 33812
- fixed a win32 warning
2008-07-18 13:24:59 +03:00
Alexander Barkov
e390f843d5 Bug#27934 test client_xml misssing initialization
Problem: missing initialization, if the previous test
fails leaving table t1, client_xml fails as well.
Fix: adding initialization.
2008-07-18 14:07:16 +05:00
Andrei Elkin
58cb8cbeb4 Bug #34647 rpl_temporary discovers more than one dump thread and fails to select
Many dump threads can exist due to a way the new version of mtr governs suites.

For this immediate problem the test is refined not to use I_S but rather to reconnect
explicitly with preserving logics of a an old target bug fixes verification.
2008-07-18 11:20:55 +03:00
Sergey Petrunia
19e2ed7642 Automerge 2008-07-17 22:28:42 +04:00
Sergey Petrunia
6cac08bcfb Merge BUG#35478 into mysql-5.1-bugteam 2008-07-17 22:26:55 +04:00
Davi Arnaut
57ba2374f8 Bug#33812: mysql client incorrectly parsing DELIMITER
Revert fix for this bug as it introduced a regression
reported in Bug#38158.
2008-07-17 15:20:01 -03:00
Timothy Smith
6eacf838ff Up-merge 5.0.66a-release changes (via 5.0) into 5.1.
Includes fix for Bug #38180, "options are read from ~/my.cnf instead of ~/.my.cnf"
2008-07-17 11:45:08 -06:00
Timothy Smith
791c7ff788 Merge in changes from mysql-5.0.66a-release into 5.0.
Includes fix for Bug #38180, "options are read from ~/my.cnf instead of ~/.my.cnf"
2008-07-17 11:08:49 -06:00
Sven Sandberg
e77957eecb BUG#38170: rpl_variables failed on pushbuild: could not sync with master
Problem: the test set @@global.init_slave to garbage at a time
which was not guaranteed to be after the time when the slave's
SQL thread used it. That would cause the slave's SQL thread to
stop in rare cases.
Fix: The test does not care about the value of
@@global.init_slave, except that it should be different on
master and slave. Hence, we set @@global.init_slave to
something that is valid SQL.
2008-07-17 18:26:59 +02:00
Sergey Petrunia
e8a5662ea9 Automerged 2008-07-17 20:22:39 +04:00
Georgi Kodinov
7f16afccfb merge of bug #37830 to 5.1 2008-07-17 18:51:24 +03:00
Georgi Kodinov
5dfdccab24 Folow-up on Bug#37069: fix a valgrind warning
Don't initalize federated if it's disabled by a command line option.
2008-07-17 17:33:41 +03:00
Georgi Kodinov
66d12592cb auto merged 5.0-bugteam to /Users/kgeorge/B37830-5.0-bugteam 2008-07-17 15:14:35 +03:00
Kristofer Pettersson
e84b915985 Automerge 2008-07-17 12:16:53 +02:00
Kristofer Pettersson
e84c8815fa Reverting patch for bug30087 2008-07-17 11:31:22 +02:00
Horst Hunger
c3c4c6b54c Fix for bug#38164. Removed test of values larger than max int for 32 bits. 2008-07-17 11:03:17 +02:00
Kristofer Pettersson
f4c138cc5e Null merge. 2008-07-17 10:43:02 +02:00
kent.boortz@sun.com
ee56895067 Set version to 5.0.66a 2008-07-17 01:33:45 +02:00
Timothy Smith
72209ac093 Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnf
Pull out some of unpack_dirname() into normalize_dirname(); this
new function does not expand "~" to the home directory.  Use this
function in unpack_dirname(), and use it during init_default_directories()
to remove duplicate entries without losing track of which directory
is a user's home dir.
2008-07-16 16:58:45 -06:00
Marc Alff
b8579849f3 Bug#30087 Set query_cache_size, if the value is too small, get a unclear warning
Reverting the previous patch
2008-07-16 16:29:22 -06:00
Kristofer Pettersson
8857b3b716 Auto merged 2008-07-16 16:12:20 +02:00
Kristofer Pettersson
00149f36a5 merge 2008-07-16 14:34:54 +02:00