summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Backport of the fix for BUG#33730 "Full table scan instead selected ↵Guilhem Bichot2009-10-054-14/+58
| | | | | partitions for query more than 10 partitions" from 6.0, made in sergefp@mysql.com-20090205190644-q8632sniogedhtsu
* Port of fix for BUG#42893 "main.information_schema times out sporadically"Guilhem Bichot2009-10-054-123/+141
| | | | (from revision konstantin@mysql.com-20080627154042-923m6lzk7z77lrgj ). This moves the slow part (10 seconds over 13) into a separate big test.
* Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-021-0/+2
|\
| * Made two test cases experimental.Alexander Nozdrin2009-10-021-0/+2
| |
* | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-012-17/+25
|\ \ | |/
| * 1. Respect experimental tag in gcov mode;Alexander Nozdrin2009-10-012-17/+25
| | | | | | 2. Mark ndb, rpl_ndb test suites experimental.
| * Update default.confAlexander Nozdrin2009-10-011-1/+1
| |
* | Merge from mysql-next-mr.Alexander Nozdrin2009-10-0114-880/+1618
|\ \
| * \ merge mysql-trunk-wl4444_4571 to mysql-wl3220-next-mrGeorgi Kodinov2009-09-2969-452/+3320
| |\ \
| * | | Ported WL#3220 to mysql-next-mr.Georgi Kodinov2009-09-2814-880/+1618
| | | |
* | | | Merge "trunk-build" up into "next-mr".Joerg Bruehe2009-09-307-15/+36
|\ \ \ \
| * \ \ \ Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-287-15/+36
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Upmerge 5.0-build -> 5.1-build.Joerg Bruehe2009-09-282-2/+3
| | |\ \ \
| | | * \ \ Merge the fix for bug#47137 into 5.0-buildJoerg Bruehe2009-09-281-1/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Solaris binary packages should be compiled with '-g0', not '-g'
| | | | * | | Fix bug#47137Joerg Bruehe2009-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solaris binary packages should be compiled with '-g0', not '-g' The main fix for this is done in the build tools, but in the sources it affects "configure.in" which sets "DEBUG_CXXFLAGS" to be used in all debug builds.
| | | * | | | Merge from mysql-5.0.86-releasehery.ramilison@sun.com2009-09-211-1/+1
| | | |\ \ \ \
| | | | * | | | change c++ comment to c commenthery2009-09-091-1/+1
| | | | |/ / /
| | * | | | | Merge main 5.1 into 5.1-build (a fix from 5.1.39).Joerg Bruehe2009-09-281-0/+1
| | |\ \ \ \ \
| | * | | | | | Fix bug#46980Joerg Bruehe2009-09-176-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option "--without-server" still not working in 5.1 The general approach is to make sure that source files which require thread support are only compiled if the build really needs thread support, which means when the server is built or a thread-safe client library. This required several changes: - Make sure the subdirectories "storage/" and "plugin/" are only processed if the server is built, not ifclient-only. - Make the compilation of some modules which inherently require threading depend on thread supportin the build. - Separate the handling of threading in "configure.in" from that of server issues, threading is also needed in a non-server build of a thread-safe client library. Also, "libdbug" must get built even in a client-only build, so "dbug/" must be in the list of client directories. In addition, calls to thread functions in source files which can be built without thread support must use the wrapper functions which handle the non-threaded build. So the modules "client/mysqlimport.c" and "client/mysqlslap.c" must call "my_thread_end()" only via "mysql_thread_end()".
| | * | | | | | Null-merge a version number change from 5.0 to 5.1Joerg Bruehe2009-09-150-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Raise version number after cloning 5.0.86hery.ramilison@sun.com2009-09-081-2/+2
| | | | |/ / / | | | |/| | |
* | | | | | | auto-mergeIngo Struewing2009-09-3013-142/+293
|\ \ \ \ \ \ \
| * | | | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-3013-142/+293
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | Bug#37267 - connect() EINPROGRESS failures mishandled in client libraryIngo Struewing2009-09-304-19/+68
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge to mysql-next-mrMikael Ronstrom2009-09-28382-3405/+19340
|\ \ \ \ \ \
| * | | | | | Update default.conf.Alexander Nozdrin2009-09-281-1/+1
| | | | | | |
| * | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-254-5/+67
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge from mysql-trunk (update default.conf).Alexander Nozdrin2009-09-251-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Update default.confAlexander Nozdrin2009-09-251-1/+1
| | | | | | |
| | * | | | | Merge from mysql-trunl-alik.Alexander Nozdrin2009-09-251-0/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Mark rpl.rpl_innodb_bug30888 experimental.Alexander Nozdrin2009-09-251-0/+1
| | | | | | |
| | * | | | | Merge from mysql-trunl-alik.Alexander Nozdrin2009-09-251-0/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Mark rpl.rpl_trigger experimental.Alexander Nozdrin2009-09-251-0/+1
| | | | | | |
| | * | | | | Merge from mysql-trunk-alik (stabilizing changes).Alexander Nozdrin2009-09-244-5/+65
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Disable ndb and rpl_ndb test suites from regular tests.Alexander Nozdrin2009-09-241-0/+5
| | | | | | |
| | | * | | | Mark some tests experimental.Alexander Nozdrin2009-09-242-5/+55
| | | | | | | | | | | | | | | | | | | | | Update default.conf.
| | * | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-244-4/+4
| | |\ \ \ \ \
| * | \ \ \ \ \ merge mysql-next-mr-alikVladislav Vaintroub2009-09-24133-1874/+10490
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Ignore a new symbolic link.Alexander Nozdrin2009-09-231-0/+1
| | | | | | | |
| | * | | | | | Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr).Alexander Nozdrin2009-09-23132-1874/+10489
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge mysql-next-mr (revno 2882) --> mysql-trunk-signalMarc Alff2009-09-2263-136/+414
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge mysql-next-mr (revno 2880) --> mysql-trunk-signalMarc Alff2009-09-205-64/+110
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge mysql-trunk-mr (revno 2879) --> mysql-trunk-signalMarc Alff2009-09-187-30/+40
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | fixed tree nameMarc Alff2009-09-171-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-17168-908/+6870
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Post merge fixesMarc Alff2009-09-1111-291/+210
| | | | | | | | | | | | |
| | | * | | | | | | | | | WL#2110 (SIGNAL)Marc Alff2009-09-10120-1571/+10263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#2265 (RESIGNAL) Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal, plus required dependencies.
| * | | | | | | | | | | | mergeVladislav Vaintroub2009-09-231-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fix compile error. definition of VOID in trunk still conflicts with windows ↵Vladislav Vaintroub2009-09-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | headers. that was fixed in 6.0
| * | | | | | | | | | | | | mergeVladislav Vaintroub2009-09-23241-1143/+7436
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | / / / / / | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
View Lorry Controller Status