summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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-releaseunknown2009-09-211-1/+1
| | |\ \
| | | * | change c++ comment to c commentmysql-5.0.86hery2009-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()". Makefile.am: The directories "storage/" and "plugin/" contain files which are needed for the server only, so their contents is to be built only if a server is built. They must not be named unconditionally, because building their contents will fail unless threads are enabled. These directories are now listed in the "configure" variable "sql_server_dirs" which becomes part of "sql_union_dirs" if the server is to be built. client/mysqlimport.c: Use the wrapper function "mysql_thread_end()" which correctly handles the case of a non-threaded build. client/mysqlslap.c: Use the wrapper function "mysql_thread_end()" which correctly handles the case of a non-threaded build. configure.in: Various changes to support builds "--without-server": 1) For the unit tests, we need "libdbug". 2) Separate the treatment of the server from that of the thread-safe client library. 3) Introduce an "automake conditional" "NEED_THREAD" which can be checked in some "Makefile.am". 4) Include "storage/" and "plugin/" in the list of "sql_server_dirs" so that they are handled in the top "Makefile.am" only if the server is to be built (see the change in that file). mysys/Makefile.am: The code of "mf_keycache.c" in 5.1 is no longer safe to be built without thread support. (In 5.0, this was possible.) Rather than fix these issues, which is tedious and risky, avoid the need to ever build it without thread support: It is needed in the server only, which needs thread support. The only case where we build a "libmysys" without thread support is for a non-threaded client, where "mf_keycache" is not neded. So its inclusion in the list of source files can depend on the new conditional "NEED_THREAD". unittest/mysys/Makefile.am: Test program "my_atomic-t" is to verify the correct handling of threads only, it cannot be built without thread support and is not needed in such cases either. Let its build depend on the new conditional "NEED_THREAD".
| * | | | Null-merge a version number change from 5.0 to 5.1Joerg Bruehe2009-09-150-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Raise version number after cloning 5.0.86unknown2009-09-081-2/+2
| | | |/ | | |/|
* | | | Update default.confAlexander Nozdrin2009-09-251-1/+1
| | | |
* | | | Mark rpl.rpl_innodb_bug30888 experimental.Alexander Nozdrin2009-09-251-0/+1
| | | |
* | | | Mark rpl.rpl_trigger experimental.Alexander Nozdrin2009-09-251-0/+1
| | | |
* | | | 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.
* | | | Update disabled.def files.Alexander Nozdrin2009-09-234-4/+4
| | | |
* | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
| | | |
* | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
| | | |
* | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-234-12/+13
|\ \ \ \
| * | | | Update version in configure.in.Alexander Nozdrin2009-09-231-1/+1
| | | | |
| * | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-231-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge from mysql-5.1.39-releaseJonathan Perkin2009-09-211-0/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Install mysqld.libmysql-5.1.39Jonathan Perkin2009-09-041-0/+1
| | | | |
| * | | | merge from 5.1 of merge from 5.1-mtrBjorn Munch2009-09-222-11/+11
| |\ \ \ \ | | |/ / /
| | * | | merge from 5.1-mtrBjorn Munch2009-09-0353-126/+341
| | |\ \ \
| | | * \ \ 3rd merge from mainBjorn Munch2009-09-039-20/+58
| | | |\ \ \ | | | | |/ /
| | | * | | mergeBjorn Munch2009-09-031-2/+2
| | | |\ \ \
| | | * | | | A few suppression follow-upsBjorn Munch2009-09-034-0/+8
| | | | | | |
| | | * | | | second merge from main, with adaptionsBjorn Munch2009-09-02145-1071/+6275
| | | |\ \ \ \
| | | * \ \ \ \ first merge from mainBjorn Munch2009-09-02913-4531/+259638
| | | |\ \ \ \ \
* | | | \ \ \ \ \ Merge from mysql-trunk.Alexander Nozdrin2009-09-2263-136/+414
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Update version.Alexander Nozdrin2009-09-221-1/+1
| | | | | | | | |
| * | | | | | | | merge from trunk-mtrBjorn Munch2009-09-2255-126/+358
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ new merge from trunkBjorn Munch2009-09-2113-77/+167
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Update default.experimental.Alexander Nozdrin2009-09-201-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-191-0/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Mark some tests experimental.Alexander Nozdrin2009-09-191-0/+11
| | | | | | | | | | |
| * | | | | | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-197-11/+46
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Raise version number after cloning 5.1.39Jonathan Perkin2009-09-031-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge from mysql-5.1.38-releaseclone-5.1.39-buildJonathan Perkin2009-09-039-20/+58
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Only install the innodb plugin if the plugin directory exists.mysql-5.1.38Jonathan Perkin2009-09-011-8/+14
| | | | | | | | |
| | | * | | | | | Disable ftexample to match other packages, ride previous changelog entry.Jonathan Perkin2009-08-251-3/+2
| | | | | | | | |
| | | * | | | | | Tidy previous, put example storage engine back as it's used by tests.Jonathan Perkin2009-08-241-5/+15
| | | | | | | | |
| | | * | | | | | Add conditionals for bundled zlib and innodb pluginJonathan Perkin2009-08-241-0/+24
| | | | | | | | |
| | | * | | | | | Apply patch from bug#46834 to install the test suite in RPMs.Jonathan Perkin2009-08-214-4/+11
| | | | | | | | |
| | | * | | | | | Add plugins to RPMs. Disable example plugins.Jonathan Perkin2009-08-211-0/+11
| | | | | | | | |
| | | * | | | | | Install innodb_plugin on Windows.Jonathan Perkin2009-08-181-0/+11
| | | | | | | | |
| | | * | | | | | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-144-11/+20
| | | | | | | | |
| | | * | | | | | Apply build fixJonathan Perkin2009-08-123-2/+3
| | | | | | | | |
| | | | * | | | | tiny suppression fix: avoid /Bjorn Munch2009-09-211-1/+1
| | | | | | | | |
View Lorry Controller Status