summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-282-1/+9
|\
| * Fixed build failuresMichael Widenius2011-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed references to deleted files - If we link staticly, check for static zlib - This should fix the problem with 'no -lz found' link error - Fixed build failure on window (Patch from Wlad) - Fixed build problem with federatedx when using -Werror BUILD/Makefile.am: Remove removed file config/ac-macros/zlib.m4: If we compile with --all-static, test that we have a static libz libmysqld/CMakeLists.txt: Fix for build error on windows mysql-test/suite/pbxt/r/key_cache.result: Updated result mysql-test/suite/pbxt/t/key_cache.test: Fixed not updated test case sql/CMakeLists.txt: Fix for build error on windows storage/federatedx/Makefile.am: Don't use CFLAGS to compile C++ programs storage/pbxt/src/lock_xt.cc: Fixed compiler warning about using uninitialized b2 storage/xtradb/buf/buf0buf.c: Fixed wrong printf storage/xtradb/srv/srv0srv.c: Fixed assignment of different width and test with different sign/unsigned
| * Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| | * Bug#57991: Compiler flag change build error : adler32.cDavi Arnaut2010-12-071-1/+4
| | | | | | | | | | | | | | | | | | | | | Do not use the same maintainer mode flags for both GCC and ICC. The -Wall option for ICC enables more warnings than its GCC counterpart.
| | * BUG#57933 "add -Wdeclaration-after-statement to gcc builds";Guilhem Bichot2010-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first part, for autotools build. config/ac-macros/maintainer.m4: Add the flag. With it, and as we use -Werror, we nicely get "error: ISO C90 forbids mixed declarations and code" if a declaration follows a statement in C code. Note that g++ refuses this flag.
* | | merge with 5.1Michael Widenius2010-11-301-2/+3
|\ \ \ | |/ /
| * | Fixed compiler and gmake warningsMichael Widenius2010-11-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed SCCS rule from Makefile.am - Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label. Don't use maintainer mode with valgrind (as we don't want to initialize all variables) config/ac-macros/maintainer.m4: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) Force initialization of variables when using -Werror (To get rid of compiler warnings) configure.in: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) sql/sql_yacc.yy: Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
| * | Merge of innodb_plugin for MySQL 5.1.53 with xtradbMichael Widenius2010-11-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings in xtradb Added back resetting of null bitmap but now in row_search_for_mysql() storage/xtradb/row/row0sel.c: Added back resetting of null bitmap but now in row_search_for_mysql()
| * | Merge with MySQL 5.1.53Michael Widenius2010-11-251-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Open issues: - A better fix for #57688; Igor is working on this - Test failure in index_merge_innodb.test ; Igor promised to look at this - Some Innodb tests fails (need to merge with latest xtradb) ; Kristian promised to look at this. - Failing tests: innodb_plugin.innodb_bug56143 innodb_plugin.innodb_bug56632 innodb_plugin.innodb_bug56680 innodb_plugin.innodb_bug57255 - Werror is disabled; Should be enabled after merge with xtradb.
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the MySQL maintainer-specific development environment (which add various warning related options to the compiler flags) if debugging support is enabled. config/ac-macros/maintainer.m4: Enable the maintainer mode if debug support is enabled. configure.in: Move debug argument to before the maintainer mode check.
| * | Merge with MySQL 5.1.52Michael Widenius2010-11-231-1/+1
| |\ \ | | |/
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-09-241-1/+1
| | | | | | | | | | | | | | | | | | Temporarily disable strict aliasing warnings in order to get wider coverage for optimized builds. Once the violations are fixed and false-positives silenced, this flag should be removed.
* | | Merge MariaDB 5.1->5.2unknown2010-11-191-43/+57
|\ \ \ | |/ /
| * | MWL#74: Shared libmysqld.so library.unknown2010-11-171-43/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch makefiles to use libtool to build libmysqld.so, as well as all its dependencies. The previous MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS() declaration is removed, as it does not work well with a libtool build. Instead, plugins that need it can specify an alternate object in MYSQL_PLUGIN_STATIC() that will be used for embedded library. The plugin must then take care itself of compiling the special object for embedded, rebuilding the source files previously listed in MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS() with @plugin_embedded_defs@ in CFLAGS/CXXFLAGS. The extra target @XXX_embedded_static_target@ is available for the special object, this will be empty when --without-embedded-server. All in-tree plugins are changed to build their static targets with libtool. Additional plugins that want to work with libmysqld.so will need to be similarly modified to build with libtool (or otherwise provide an -fPIC object). Dynamically loaded plugins are not affected. The old libraries like libmysys.a, libmyisam.a and similar libraries, which were installed by `make install` though this is of little use, are still built and installed to not break package scripts etc. that expect them. These libraries are kept static to avoid introducing new .so dependencies. The patch also fixes a handfull of duplicate symbol linker errors, where we included some object twice during linking; these for one reason or another did not produce errors before but caused problems on some platforms with this patch (eg. Mac OS X linker is more strict for shared objects). This patch only does what is necessary to build libmysqld.so. There are some more cleanups that are possible now that we are using libtool more fully, which could done in subsequent patches (though we may not bother as we are switching from autotools to CMake anyway): - In libmysql_r/, we should be able to just link libmysys.la etc, instead of symlinking and re-compiling sources into the directory. - In libmysql/, we can similarly avoid symlinking and recompiling sources if we instead build a libmysys_nothread.la library with appropriate CFLAGS and link that. - In sql/, we can build a separate target libmysql_int.la with appropriate CFLAGS for embedded and use that in libmysqld/ instead of symlinking sources. - libmysys.a, libmyisam.a and similar libraries could be installed as .so also to save on code size; or alternatively could be not installed at all. client/Makefile.am: Updated for using libtool config/ac-macros/plugins.m4: Replace MUSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS with mechanism for plugins to specify alternate object for embedded. configure.in: Fix linking duplicate objects related to THREAD_LOBJECTS. dbug/Makefile.am: Updated for using libtool extra/Makefile.am: Fix relative paths. libmysqld/Makefile.am: Build libmysqld.la using libtool libmysqld/examples/Makefile.am: Updated to use libtool mysys/Makefile.am: Updated to use libtool. Fix linking duplicate objects related to THREAD_LOBJECTS. mysys/my_uuid.c: Fix conflicting global mutex name by making it static. regex/Makefile.am: Updated to use libtool sql/Makefile.am: Updated to use libtool sql/item_func.cc: Fix conflicting mutex name. sql/mysql_priv.h: Fix conflicting mutex name sql/mysqld.cc: Fix conflicting mutex name. Add missing call of my_uuid_end(). storage/archive/Makefile.am: Updated to use libtool storage/archive/plug.in: Updated to use libtool storage/blackhole/Makefile.am: Updated to use libtool storage/blackhole/plug.in: Updated to use libtool storage/csv/Makefile.am: Updated to use libtool storage/csv/plug.in: Updated to use libtool storage/example/Makefile.am: Updated to use libtool storage/federated/Makefile.am: Updated to use libtool storage/federated/plug.in: Updated to use libtool storage/federatedx/Makefile.am: Updated to use libtool storage/federatedx/plug.in: Updated to use libtool storage/heap/Makefile.am: Updated to use libtool storage/heap/plug.in: Updated to use libtool storage/innobase/Makefile.am: Updated to use libtool storage/innobase/plug.in.disabled: Updated to use libtool storage/innodb_plugin/Makefile.am: Updated to use libtool storage/maria/CMakeLists.txt: Fix linking duplicate object in maria_dump_log, causes failure on Mac OS X storage/maria/Makefile.am: Updated to use libtool Fix linking duplicate object in maria_dump_log, causes link failure on Mac OS X storage/maria/ma_loghandler.c: Move maria_dump_log code to separate file to fix duplicate object link failures. storage/maria/ma_loghandler.h: Move maria_dump_log code to separate file to fix duplicate object link failures. storage/maria/maria_dump_log.c: Move maria_dump_log code to separate file to fix duplicate object link failures. storage/maria/plug.in: Updated to use libtool storage/myisam/Makefile.am: Updated to use libtool storage/myisam/plug.in: Updated to use libtool storage/myisammrg/Makefile.am: Updated to use libtool storage/myisammrg/plug.in: Updated to use libtool storage/pbxt/plug.in: Updated to use libtool storage/pbxt/src/Makefile.am: Updated to use libtool storage/xtradb/Makefile.am: Updated to use libtool storage/xtradb/plug.in: Updated to use libtool strings/Makefile.am: Updated to use libtool unittest/unit.pl: Don't attempt to run libtool internal files as unit tests. vio/Makefile.am: Updated to use libtool
* | | fix for bug#673634:Sergei Golubchik2010-11-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better MYSQL_PLUGIN_WITHOUT that works correctly in all of the following: --with-plugin-XXX --without-plugin-XXX --with-plugins=XXX --with-plugins=META --with-plugins=XXX --without-plugin-XXX --with-plugins=META --without-plugin-XXX
* | | mergedSergei Golubchik2010-09-211-2/+2
|\ \ \ | |/ /
| * | bug in plugin.m4 that prevented group list in the MYSQL_PLUGIN declaration ↵Sergei Golubchik2010-09-181-2/+2
| | | | | | | | | | | | from working.
* | | extended configure script to report plugin configuration summary.Sergei Golubchik2010-09-211-11/+17
| | | | | | | | | | | | corrected the manual url to point to kb
* | | merge with 5.1Sergei Golubchik2010-09-161-0/+8
|\ \ \ | |/ /
| * | don't build dynamic plugins when configured with --disable-shared.Sergei Golubchik2010-09-141-0/+8
| | | | | | | | | | | | libtool does not like it and fails the build.
* | | MYSQL_PLUGIN_WITHOUT() macro for plug.inSergei Golubchik2010-09-141-0/+24
| | | | | | | | | | | | | | | Using it in oqgraph/plug.in to fix bug#635633
* | | merge with 5.1Sergei Golubchik2010-09-111-0/+64
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-0/+64
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | - Changed to still use bcmp() in certain cases becasue - Faster for short unaligneed strings than memcmp() - Bettern when using valgrind - Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems - Changed code to use MariaDB version of select->skip_record() - Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
| | * Remove AC_LANG_WERROR, it causes trouble earlier versionsDavi Arnaut2010-07-091-2/+0
| | | | | | | | | | | | of autoconf and is not strictly needed for now.
| | * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-091-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a MySQL maintainer/developer mode that enables a set of warning options for the C/C++ compiler. This mode is intended to help improve the overall quality of the code. The warning options are: C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Werror" CXX_WARNINGS="$C_WARNINGS -Wno-unused-parameter" Since -Wall is essentially a moving target, autoconf checks are not run with warning options enabled, in particualr -Werror. This decision might be revisited in the future. The patch also fixes a mistake in the makefiles, where automake CXXFLAGS would be set to CFLAGS. config/ac-macros/maintainer.m4: Add a set of default compiler flags used when in maintainer mode. configure.in: Hook into the maintainer mode. Disabled by default.
* | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-1/+10
|\ \ \ | |/ / | | | | | | | | | Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
| * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-1/+10
| |\ \ | | |/ | | | | | | Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
| | * Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-081-1/+10
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | config/ac-macros/ssl.m4: Enable yaSSL thread safety if linking with the server or a thread safe client library. Avoids building a thread safe yaSSL when only building a non-thread safe client library.
| | | * Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the bundled yaSSL library was being built without thread safety support regardless of the thread safeness of the compoments linked with it. The solution is to enable yaSSL thread safety support if any component (server or client) is to be built with thread support. Also, generate new certificates for yaSSL's test suite. config/ac-macros/yassl.m4: Enable yaSSL thread safety if linking with the server or a thread safe client library. Avoids building a thread safe yaSSL when only building a non-thread safe client library. extra/yassl/CMakeLists.txt: Always enable for Windows builds. extra/yassl/certs/ca-cert.pem: New certificate, previous one expired. extra/yassl/certs/client-cert.der: New certificate, previous one expired. extra/yassl/certs/client-cert.pem: New certificate, previous one expired. extra/yassl/certs/dsa-cert.pem: New certificate, previous one expired. extra/yassl/certs/server-cert.pem: New certificate, previous one expired. extra/yassl/include/lock.hpp: Rename MULTI_THREAD to YASSL_THREAD_SAFE. extra/yassl/src/Makefile.am: Use CXXFLAGS to set thread related definitions as the lock header (lock.hpp) has no local dependencies. extra/yassl/src/lock.cpp: Rename MULTI_THREAD to YASSL_THREAD_SAFE. extra/yassl/taocrypt/CMakeLists.txt: Always enable for Windows builds. extra/yassl/taocrypt/benchmark/Makefile.am: Pass thread related CXXFLAGS. extra/yassl/taocrypt/src/Makefile.am: Pass thread related CXXFLAGS. extra/yassl/taocrypt/test/Makefile.am: Pass thread related CXXFLAGS. extra/yassl/taocrypt/test/memory.cpp: Rename MULTI_THREAD to YASSL_THREAD_SAFE. extra/yassl/testsuite/Makefile.am: Pass thread related CXXFLAGS.
| | * | auto-mergeTimothy Smith2009-11-041-3/+3
| | |\ \ | | | |/
| | | * Fix for Bug#40700: aclocal warnings for missing cache-id'sTimothy Smith2009-11-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just change mysql_foo to mysql_cv_foo for one cache-id variable name. There was only one bad variable name, present in 5.0 and 5.1, but not in the -pe branch.
* | | | Maria WL#61unknown2010-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interface for maria extensions. Alternative plugin interface with additional info (maturity and string version). CMakeLists.txt: Maria plugin interface used. config/ac-macros/plugins.m4: Maria plugin interface used. configure.in: Maria plugin interface used. include/mysql/plugin.h: Maria plugin interface added. include/mysql/plugin_auth.h.pp: Maria plugin interface added. plugin/auth/auth_socket.c: Maria plugin interface added. plugin/auth/dialog.c: Maria plugin interface added. plugin/daemon_example/daemon_example.cc: Maria plugin interface added. plugin/fulltext/plugin_example.c: Maria plugin interface added. sql/ha_ndbcluster.cc: Maria plugin interface added. sql/ha_partition.cc: Maria plugin interface added. sql/log.cc: Maria plugin interface added. sql/sql_acl.cc: Maria plugin interface added. sql/sql_builtin.cc.in: Maria plugin interface used. sql/sql_plugin.cc: Maria plugin interface added. sql/sql_plugin.h: Maria plugin interface used. sql/sql_show.cc: Maria plugin interface added. storage/archive/ha_archive.cc: Maria plugin interface added. storage/blackhole/ha_blackhole.cc: Maria plugin interface added. storage/csv/ha_tina.cc: Maria plugin interface added. storage/example/ha_example.cc: Maria plugin interface added. storage/federated/ha_federated.cc: Maria plugin interface added. storage/federatedx/ha_federatedx.cc: Maria plugin interface added. storage/heap/ha_heap.cc: Maria plugin interface added. storage/ibmdb2i/ha_ibmdb2i.cc: Maria plugin interface added. storage/innobase/handler/ha_innodb.cc: Maria plugin interface added. storage/innodb_plugin/handler/i_s.cc: Maria plugin interface added. storage/maria/ha_maria.cc: Maria plugin interface added. storage/myisam/ha_myisam.cc: Maria plugin interface added. storage/myisammrg/ha_myisammrg.cc: Maria plugin interface added. storage/pbxt/src/ha_pbxt.cc: Maria plugin interface added. storage/xtradb/handler/ha_innodb.cc: Maria plugin interface added. storage/xtradb/handler/i_s.cc: Maria plugin interface added. storage/xtradb/handler/i_s.h: Maria plugin interface added.
* | | | tell autoconf about --with-plugin options to avoidSergei Golubchik2010-03-291-0/+1
|/ / / | | | | | | | | | configure: WARNING: unrecognized options: --without-plugin-xxx
* | | now we force at least libevent-1.4Sergei Golubchik2010-01-301-4/+4
| | |
* | | Support building with system libeventSergei Golubchik2010-01-291-18/+58
| | |
* | | Merge fix for PBXT running inside embedded server (MBug#439889).unknown2009-12-221-6/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also some small fixes to make the PBXT testsuite work in --embedded. config/ac-macros/plugins.m4: MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS macro extended to support multiple files. mysql-test/std_data/pbxt_load_unique_error1.inc: Move file to be accessible also for testing embedded server. mysql-test/suite/pbxt/r/pbxt_bugs.result: Fix LOAD DATA LOCAL INFILE path so it works also for testing embedded server. mysql-test/suite/pbxt/t/pbxt_bugs.test: Fix LOAD DATA LOCAL INFILE path so it works also for testing embedded server. mysql-test/suite/pbxt/t/pbxt_locking.test: Disable for embedded, as it needs SHOW PROCESSLIST functionality not available there. mysql-test/suite/pbxt/t/pbxt_transactions.test: Disable test for embedded, as it needs ability to connect from outside (mysqldump). mysql-test/suite/pbxt/t/ps_1general.test: Fix replace_result for new mysql-test-run.pl. sql/sql_plugin.cc: Remove hack that disables PBXT in embedded. storage/pbxt/plug.in: Fix crash in PBXT in embedded server. storage/pbxt/src/Makefile.am: Remove not needed CFLAGS/CXXFLAGS (they cause autotools to generate different object names, which in turn cause the MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS replacement of object files inside library files not to work). storage/pbxt/src/ha_pbxt.cc: Ugly hack to allow more threads in embedded server (need a better fix I think). storage/pbxt/src/table_xt.cc: Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages). storage/pbxt/src/thread_xt.cc: Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages). storage/pbxt/src/trace_xt.cc: Use stderr for logging not stdout (prevent spamming --embedded test suite output with stray messages).
| * | | fixed bug #439889: Embedded server asserts on startup because of pbxtVladimir Kolesnikov2009-12-091-5/+7
|/ / /
* | | Used the correct path to the bundled libevent includes.Peter Lieverdink2009-09-301-1/+1
| | |
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-3/+3
|\ \ \
| * | | Fix most Compiler warnings seen in buildbot.unknown2009-09-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add suppressions for a few warnings that cannot be meaningfully fixed by MariaDB developers. Changes for XtraDB, PBXT, and YaSSL also submitted upstream. Also add a `ccfilter` wrapper that can be used to filter out suppressed warnings in a local build (to check that new warnings are not introduced). client/mysqlbinlog.cc: Fix compiler warnings. config/ac-macros/misc.m4: Fix wrong naming, autoconfig requires _cv_ in cached names. extra/yassl/include/yassl_int.hpp: Fix compiler warnings. extra/yassl/src/handshake.cpp: Fix compiler warnings. extra/yassl/src/yassl_imp.cpp: Fix compiler warnings. extra/yassl/src/yassl_int.cpp: Fix compiler warnings. extra/yassl/taocrypt/include/modes.hpp: Fix compiler warnings. extra/yassl/taocrypt/src/asn.cpp: Fix compiler warnings. mysys/my_compress.c: Fix compiler warnings. sql/mysqld.cc: Fix compiler warnings. sql/strfunc.cc: Fix compiler warnings. storage/pbxt/src/discover_xt.cc: Fix compiler warnings. storage/xtradb/fil/fil0fil.c: Fix compiler warnings. storage/xtradb/mtr/mtr0mtr.c: Fix compiler warnings. storage/xtradb/srv/srv0srv.c: Fix compiler warnings. storage/xtradb/srv/srv0start.c: Fix compiler warnings. strings/decimal.c: Fix compiler warnings. support-files/ccfilter: Add helper for suppressing compiler warnings in local developer source tree. Allows to check for not introducing new warnings into Buildbot without having to actually run the build through Buildbot. support-files/compiler_warnings.supp: Suppress a few warnings that cannot be meaningfully fixed in source code.
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-082-11/+61
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | * Finished Monty and Jani's merge * Some InnoDB tests still fail (because it's old xtradb code run against newer testsuite). They are expected to go after mergning with the latest xtradb.
| * | Merge approved bug fixJim Winstead2009-08-051-6/+49
| |\ \
| | * | Not all of the necessary tests for multi-byte support in readlineJim Winstead2009-07-311-6/+49
| | | | | | | | | | | | | | | | | | | | were included in the configure tests. (Bug #46310)
| * | | Merge the fix for bug#42213 up into 5.1-build:Joerg Bruehe2009-07-301-0/+4
| |\ \ \ | | |/ / | |/| / | | |/ | | | Check for "stack overrun" doesn't work, server crashes
| | * Our autoconf function "MYSQL_STACK_DIRECTION" will not workJoerg Bruehe2009-07-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly if the compiler optimizes too clever. This has happaned on HP-UX 11.23 (IA64) at optimization level "+O2", causing bug#42213: Check for "stack overrun" doesn't work, server crashes Fix it by adding a pragma that prevents this optimization. As a result, it should be safe to use "+O2" on this platform (unless there is some other, optimizer-related, bug which is just currently masked because we use resudec optimization). config/ac-macros/misc.m4: Our autoconf function "MYSQL_STACK_DIRECTION" is meant to determine whether the stack grows towards higher or towards lower addresses. It does this by comparing the addresses of a variable (which is local to a recursive function) on different nesting levels. This approach requires that the function is really implemented as a recursive function, with each nested call allocating a new stack frame containing the local variable. If, however, the compiler is optimizing so clever that the recursive function is implemented by a loop, then this test will not produce correct results. This has happened on HP-UX 11.23 (IA64) when HP's compiler was called with optimization "+O2" (not with "+O1"), reported as bug#42213. Rather than starting a race with the compiler and making the function so complicated that this optimization does not happen, the idea is to prevent the optimization by adding a pragma. For HP, this is "#pragma noinline". If we encounter other compilers which also optimize too clever, we may add their pragmas here. It is a debatable issue whether such pragmas should be guarded by conditional compiling or not, the reviewers voted to do it. It seems HP has different compilers, "ANSI C" and "aCC", on the affected platform "__HP_cc" ("ANSI C") is predefined. To be on the safe side, the pragma will also take effect if HP's "aCC" compiler is used, or any other compiler on HP-UX.
| * | AutomergeAlexey Kopytov2009-03-251-5/+8
| |\ \ | | |/
| | * Accept wide-character version of libncurses also.Chad MILLER2009-03-111-5/+8
| | |
* | | Merged with mysql-5.1 tree.Michael Widenius2009-04-252-37/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.cc: Manually merged configure.in: Manually merged mysql-test/r/variables.result: Manually merged mysql-test/t/variables.test: Manually merged mysys/my_pread.c: Manually merged mysys/my_read.c: Manually merged sql/mysqld.cc: Manually merged storage/csv/ha_tina.h: Manually merged storage/myisam/ha_myisam.cc: Manually merged storage/myisam/mi_check.c: Manually merged storage/myisam/mi_search.c: Manually merged
| * | Bug #43614: make distcheck failure (ndb/Makefile is made, but not subdirs of ↵Georgi Kodinov2009-03-132-37/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb) There are some recursive targets that automake generates which reference DIST_SUBDIRS. It's critical, then, for such subdirs to exist even if they won't be built as part of SUBDIRS. During a VPATH build, it is the configure script which creates the subdirs (when it processes the AC_CONFIG_FILES() for each subdir's Makefile). If autoconf doesn't create a subdir's Makefile, then the recursive make will fail when it is unable to cd into that subdir. This isn't a problem in non-VPATH builds, because the subdirs are all present in the source tarball. So the problem only shows up during 'make distcheck', which does a VPATH build. The fix is to look, when configure is being created by autoconf, for any plugin subdirectories. These are the dynamic subdirectories which need to be handled specially. It's enough to tell autoconf to generate a Makefile for any Makefile.am found in the plugin directory - all plugin subdirectories using automake (i.e., listed in the plugin's DIST_SUBDIRS) will have a Makefile.am. This is done by calling 'find'. This means that 'find' must be in the PATH on the host that is running autoconf. 'find' is NOT needed when calling configure, so it is not an additional dependency for the user. Finally, ha_ndbcluster.m4 had called AC_CONFIG_FILES() on all those subdir Makefiles, but only when the plugin was actually being built. So it didn't work in the case that NDB was not being built. All of those Makefiles have to be removed from this static list, since the plugin machinery is now adding them automatically. autoconf fails if a file is duplicated in AC_CONFIG_FILES().
* | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-21/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Manually merged mysql-test/lib/My/ConfigFactory.pm: Manually merged mysql-test/mysql-test-run.pl: Manually merged mysql-test/t/information_schema.test: Manually merged sql/handler.cc: Manually merged support-files/mysql.spec.sh: Manually merged
View Lorry Controller Status