Commit graph

58494 commits

Author SHA1 Message Date
Alexander Nozdrin
dbab87af6a Merge from mysql-trunk-bugfixing. 2009-10-01 15:32:45 +04:00
Alexander Nozdrin
83566cd4f1 1. Respect experimental tag in gcov mode;
2. Mark ndb, rpl_ndb test suites experimental.
2009-10-01 15:31:54 +04:00
Alexander Nozdrin
5485e4475e Merge from mysql-next-mr. 2009-10-01 15:22:37 +04:00
Alexander Nozdrin
668c2c1f0f Update default.conf 2009-10-01 15:18:24 +04:00
Joerg Bruehe
de0285a2e5 Merge "trunk-build" up into "next-mr". 2009-09-30 22:31:22 +02:00
Ingo Struewing
309ffb8b13 auto-merge 2009-09-30 12:30:09 +02:00
Ingo Struewing
1e87babb19 Bug#37267 - connect() EINPROGRESS failures mishandled in client library
We cann connect() in a non-blocking mode to be able to specify a
non-standard timeout.

The problem was that we did not fetch the status from the
non-blocking connect(). We assumed that poll() would not return
a POLLIN flag if the connect failed. But on some platforms this
is not true.

After a successful poll() we do now retrieve the status value
from connect() with getsockopt(...SO_ERROR...). Now we do know
if (and how) the connect failed.

The test case for my investigation was rpl.rlp_ssl1 on an
Ubuntu 9.04 x86_64 machine. Both, IPV4 and IPV6 were active.
'localhost' resolved first for IPV6 and then for IPV4. The
connection over IPV6 was blocked. rpl.rlp_ssl1 timed out
as it did not notice the failed connect(). The first read()
failed, which was interpreted as a master crash and the
connection was tried to reestablish with the same result
until the retry limit was reached.

With the fix, the connect() problem is immediately recognized,
and the connect() is retried on the second resolution for
'localhost', which is successful.
2009-09-30 12:28:15 +02:00
Guilhem Bichot
b3886f46da Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":
DECIMAL and TIMESTAMP used to have NUM_FLAG, but NEWDECIMAL was forgotten.
It's correct that TIMESTAMP does not have the flag nowadays (manual will be updated, connectors
developers will be notified).
2009-09-30 12:25:50 +02:00
Georgi Kodinov
3f7624fc08 merge mysql-trunk-wl4444_4571 to mysql-wl3220-next-mr 2009-09-29 10:34:37 +03:00
Joerg Bruehe
650e68b7dc Merge 5.1-build up into 5.4-build ("trunk-build"). 2009-09-28 11:39:36 +02:00
Joerg Bruehe
1d9c5686c3 Upmerge 5.0-build -> 5.1-build. 2009-09-28 11:07:31 +02:00
Joerg Bruehe
031ee861a9 Merge main 5.1 into 5.1-build (a fix from 5.1.39). 2009-09-28 10:52:28 +02:00
Joerg Bruehe
793e369bfe Merge the fix for bug#47137 into 5.0-build
Solaris binary packages should be compiled with '-g0', not '-g'
2009-09-28 10:43:26 +02:00
Mikael Ronstrom
70cb38ec82 Merge to mysql-next-mr 2009-09-28 09:39:50 +02:00
Georgi Kodinov
7aa8cd7a11 Ported WL#3220 to mysql-next-mr. 2009-09-28 10:21:25 +03:00
Alexander Nozdrin
3a5c4ab4b2 Update default.conf. 2009-09-28 00:54:22 +04:00
Alexander Nozdrin
23e8e0a1c1 Merge from mysql-next-mr. 2009-09-25 18:58:53 +04:00
Alexander Nozdrin
b21cd91780 Merge from mysql-trunk (update default.conf). 2009-09-25 13:47:58 +04:00
Alexander Nozdrin
1984a19bdd Update default.conf 2009-09-25 13:42:54 +04:00
Alexander Nozdrin
150511556f Merge from mysql-trunl-alik. 2009-09-25 13:40:53 +04:00
Alexander Nozdrin
753b7c3d1d Mark rpl.rpl_innodb_bug30888 experimental. 2009-09-25 13:40:25 +04:00
Alexander Nozdrin
bee4da8d23 Merge from mysql-trunl-alik. 2009-09-25 13:23:30 +04:00
Alexander Nozdrin
98b69441e7 Mark rpl.rpl_trigger experimental. 2009-09-25 13:21:49 +04:00
Alexander Nozdrin
19a223fee4 Merge from mysql-trunk-alik (stabilizing changes). 2009-09-24 16:40:09 +04:00
Alexander Nozdrin
7004ce6de1 Merge from mysql-next-mr. 2009-09-24 16:38:47 +04:00
Alexander Nozdrin
ddaaeb6fad Disable ndb and rpl_ndb test suites from regular tests. 2009-09-24 16:30:13 +04:00
Alexander Nozdrin
31189ee8be Mark some tests experimental.
Update default.conf.
2009-09-24 16:29:29 +04:00
Vladislav Vaintroub
281909362c merge mysql-next-mr-alik 2009-09-24 12:35:16 +02:00
Vladislav Vaintroub
ff3acc311f merge 2009-09-23 22:19:11 +02:00
Vladislav Vaintroub
47fedb97b4 merge 2009-09-23 22:15:22 +02:00
Alexander Nozdrin
28d3028216 Merge from mysql-trunk. 2009-09-23 22:52:21 +04:00
Alexander Nozdrin
de9037bb0a Update disabled.def files. 2009-09-23 22:50:13 +04:00
Alexander Nozdrin
1df46c4e5b Ignore a new symbolic link. 2009-09-23 18:02:39 +04:00
Alexander Nozdrin
2ff2b14477 Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr). 2009-09-23 17:57:39 +04:00
Alexander Nozdrin
8dd75c98ed Update default.conf. 2009-09-23 14:12:43 +04:00
Alexander Nozdrin
9b9f814d63 Merge from mysql-next-mr. 2009-09-23 14:11:41 +04:00
Alexander Nozdrin
1bb4ba29be Merge from mysql-trunk. 2009-09-23 14:10:04 +04:00
Alexander Nozdrin
04fff1e8fe Update default.conf. 2009-09-23 14:08:38 +04:00
Alexander Nozdrin
e4ebc5c6d9 Update default.conf. 2009-09-23 14:04:08 +04:00
Alexander Nozdrin
928de7ede6 Merge from mysql-trunk. 2009-09-23 13:59:23 +04:00
Alexander Nozdrin
abf845b9d4 Merge from mysql-trunk-alik. 2009-09-23 13:51:45 +04:00
Alexander Nozdrin
72feecb4f0 Update version in configure.in. 2009-09-23 13:50:31 +04:00
Alexander Nozdrin
665fda8b55 Merge from mysql-trunk(-alik). 2009-09-23 11:17:49 +04:00
Alexander Nozdrin
22ceefcb58 Merge from mysql-5.1. 2009-09-23 11:16:11 +04:00
Bjorn Munch
c82ce4629c merge 5.1-mtr -> 5.1 -> trunk 2009-09-23 00:49:34 +02:00
Bjorn Munch
726df480f9 merge from 5.1 of merge from 5.1-mtr 2009-09-22 23:41:37 +02:00
Marc Alff
12a6ee6da3 Merge mysql-next-mr (revno 2882) --> mysql-trunk-signal 2009-09-22 09:22:22 -06:00
Alexander Nozdrin
46a04938eb Merge from mysql-next-mr. 2009-09-22 18:26:17 +04:00
Alexander Nozdrin
8878213408 Merge from mysql-trunk. 2009-09-22 18:24:53 +04:00
Alexander Nozdrin
d6022269a6 Merge from mysql-trunk. 2009-09-22 18:23:12 +04:00