summaryrefslogtreecommitdiff
path: root/configure.in
Commit message (Collapse)AuthorAgeFilesLines
* configure.in, net_serv.cc, compile-netware-END:unknown2006-06-171-3/+3
| | | | | | | | | | | | | | Changes for Netware sql/net_serv.cc: Netware needs <sys/select.h> configure.in: Call of "comp_err" has moved, changed code for Netware that edits make files to reflect this netware/BUILD/compile-netware-END: After correcting "configure.in" to edit make files correctly, removed obsolete "sed" of "extra/Makefile.am" for Netware
* configure.in:unknown2006-05-241-2/+2
| | | | | | | | Stepped up to 5.0.23 configure.in: Stepped up to 5.0.23
* Merge shellback.(none):/home/msvensson/mysql/mysql-5.0unknown2006-04-271-1/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged configure.in: Auto merged extra/yassl/include/openssl/rsa.h: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/include/yassl_types.hpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/taocrypt/include/integer.hpp: Auto merged extra/yassl/taocrypt/include/misc.hpp: Auto merged extra/yassl/taocrypt/src/algebra.cpp: Auto merged extra/yassl/taocrypt/src/template_instnt.cpp: Auto merged mysql-test/t/disabled.def: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged extra/yassl/include/openssl/ssl.h: Manual merge extra/yassl/src/handshake.cpp: Manual merge extra/yassl/src/yassl_int.cpp: Manual merge extra/yassl/taocrypt/include/runtime.hpp: Manual merge extra/yassl/taocrypt/src/integer.cpp: Manual merge mysql-test/mysql-test-run.pl: Manual merge mysql-test/r/trigger.result: Manual merge mysql-test/t/trigger.test: Manual merge
| * Remove hacks for building shared libs on aix and qnxunknown2006-04-261-39/+0
| |
| * Fix for building shared libraries on AIX with 64-bit modeunknown2006-04-221-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | Set building of shared libraries on QNX to defatul OFF configure.in: -Libtool forgets to pass the -q64 and -X64 flags to "nm" and "xlc_r" when building for 64-bit on AIX. Add some hacks before we create libtool that fixes this. This test should be integrated into autoconf/libtool -Set default to not build shared librarues on QNX. When building libmysqlclient and libmysqlclient_r so many objects are passed to libtool that sh propably runs out of stack and segfaults.
| * Merge neptunus.(none):/home/msvensson/mysql/my50-bug18837unknown2006-04-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint configure.in: Auto merged
| | * Bug#18837 Many build and test failures when configuring without --disable-sharedunknown2006-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Build "NOINST" tools with -static flag to avoid any ld problems when using them configure.in: Build "NOINST" tools with -static flag to avoid any ld problems when using them
* | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-newunknown2006-04-271-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new configure.in: Auto merged sql/sql_parse.cc: Auto merged
| * \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-04-191-3/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new configure.in: Auto merged
| | * | | configure.in:unknown2006-04-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for crypt() in libc first (bug#16478) configure.in: Check for crypt() in libc first (bug#16478)
* | | | | configure.in:unknown2006-04-261-2/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | clone-off for 5.0.21 configure.in: clone-off for 5.0.21
* | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2006-04-131-0/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0 BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged configure.in: Auto merged mysql-test/r/func_op.result: Auto merged sql/item_func.cc: Auto merged
| * | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0unknown2006-04-111-0/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 acinclude.m4: Auto merged configure.in: Auto merged
| | * Avoid trying to include <asm/atomic.h> when it doesn't work in C++unknown2006-04-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | code. (Bug #13621) configure.in: Test whether atomic_add() and atomic_sub() are available in C++ code, since that is primarily where we will be using them.
* | | configure.in:unknown2006-03-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Increased version number because of clone-off configure.in: Increased version number because of clone-off
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-03-201-14/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835 client/mysqltest.c: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/item_func.cc: Auto merged sql/sql_udf.cc: Auto merged
| * | | Don't look for "dlopen" if server linked with -static or -all-static flag. ↵unknown2006-03-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update after review configure.in: Don't look for "dlopen" if server linked with -static or -all-static flag
| * | | Merge neptunus.(none):/home/msvensson/mysql/bug11835/my41-bug11835unknown2006-03-101-14/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835 configure.in: Auto merged
| | * | | Bug#11835 CREATE FUNCTION crashes serverunknown2006-03-101-14/+28
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't look for 'dl_open' if mysqld is compiled with "-all-static" configure.in: No need to check for dlopen when mysqld is linked with -all-static as it won't be able to load any functions (and in some cases segfaults)
* | | | Porting fix that allows others to include compiled code with different parsers. unknown2006-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes you wonder what I am up to, doesn't? configure.in: Adjusts bison to not create symbols that clash. sql/sql_analyse.cc: Adding define to make sure sql_yacc.h gets included. sql/sql_lex.cc: Fixing it so that sql_yacc.h is included sql/sql_lex.h: Fixing include rules sql/sql_parse.cc: Adding flag to compile sql_yacc.yy
* | | | configure.in:unknown2006-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloned configure.in: cloned
* | | | Fixed compiler warnings from gcc 4.0.2:unknown2006-02-251-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added empty constructors and virtual destructors to many classes and structs - Removed some usage of the offsetof() macro to instead use C++ class pointers configure.in: Added comment ndb/include/ndbapi/NdbDictionary.hpp: Fixed compiler warnings from gcc 4.0.2 sql/field.cc: Fixed compiler warnings from gcc 4.0.2 sql/handler.h: Fixed compiler warnings from gcc 4.0.2 sql/item.h: Fixed compiler warnings from gcc 4.0.2 sql/item_cmpfunc.h: Fixed compiler warnings from gcc 4.0.2 sql/log_event.h: Fixed compiler warnings from gcc 4.0.2 sql/mysql_priv.h: Fixed compiler warnings from gcc 4.0.2 For find_table_in_list I fixed it to use proper C++ class pointers instead of C style pointers sql/opt_range.cc: Fixed compiler warnings from gcc 4.0.2 sql/parse_file.h: Fixed compiler warnings from gcc 4.0.2 sql/sp_rcontext.h: Fixed compiler warnings from gcc 4.0.2 sql/spatial.h: Fixed compiler warnings from gcc 4.0.2 sql/sql_base.cc: Fixed compiler warnings from gcc 4.0.2 sql/sql_cache.h: Fixed compiler warnings from gcc 4.0.2 sql/sql_class.h: Fixed compiler warnings from gcc 4.0.2 sql/sql_parse.cc: Fixed compiler warnings from gcc 4.0.2 (Not pretty, but seams to work...) sql/sql_select.h: Fixed compiler warnings from gcc 4.0.2 sql/sql_update.cc: Fixed compiler warnings from gcc 4.0.2 sql/table.h: Fixed compiler warnings from gcc 4.0.2 sql/tztime.cc: Fixed compiler warnings from gcc 4.0.2 sql/tztime.h: Fixed compiler warnings from gcc 4.0.2
* | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-02-021-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root BitKeeper/deleted/.del-rpl_ignore_table.result: Delete: mysql-test/r/rpl_ignore_table.result BitKeeper/deleted/.del-rpl_multi_update4.result: Delete: mysql-test/r/rpl_multi_update4.result BitKeeper/deleted/.del-rpl_ignore_table-slave.opt: Delete: mysql-test/t/rpl_ignore_table-slave.opt BitKeeper/deleted/.del-rpl_ignore_table.test: Delete: mysql-test/t/rpl_ignore_table.test BitKeeper/deleted/.del-rpl_multi_update4-slave.opt: Delete: mysql-test/t/rpl_multi_update4-slave.opt BitKeeper/deleted/.del-disabled.def: Auto merged BitKeeper/deleted/.del-rpl_multi_update4.test: Delete: mysql-test/t/rpl_multi_update4.test heap/hp_create.c: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/kill.test: Auto merged mysql-test/t/update.test: Auto merged ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged ndb/test/ndbapi/testBlobs.cpp: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged configure.in: Manual merge. libmysql/libmysql.c: Manual merge. mysql-test/r/heap.result: Manual merge. mysql-test/r/heap_hash.result: Manual merge. mysql-test/r/kill.result: Manual merge. sql/ha_heap.cc: Manual merge. sql/ha_heap.h: Manual merge. sql/item_timefunc.cc: Manual merge. sql/sql_class.cc: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_update.cc: Manual merge. tests/mysql_client_test.c: Manual merge.
| * | configure.in:unknown2006-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Cloned off 4.1.18, new release number 4.1.19 configure.in: New release number
| * | configure.in:unknown2006-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Generated "libmysql.ver" will be in \$(top_builddir) configure.in: Generated "libmysql.ver" will be in \$(top_builddir)
* | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-01-181-1/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root BitKeeper/etc/ignore: auto-union libmysql/Makefile.shared: Auto merged configure.in: Manual merge. libmysql/libmysql.c: Manual merge. tests/mysql_client_test.c: Manual merge.
| * | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-181-1/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1 configure.in: Auto merged
| | * | BUG#3074: Unversioned symbols in shared libraryunknown2006-01-171-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysqlclient versioning when linked with GNU ld. BitKeeper/etc/ignore: Added libmysql/libmysql.ver to the ignore list configure.in: libmysqlclient versioning when linked with GNU ld. libmysql/Makefile.shared: libmysqlclient versioning when linked with GNU ld. libmysql/libmysql.ver.in: New BitKeeper file ``libmysql/libmysql.ver.in''
| * | | Increase the version number to 4.1.18unknown2006-01-171-2/+2
| |/ /
| * | Raise the version number (as 4.1.16 has been cloned).unknown2005-11-301-2/+2
| | |
* | | Increment the version number to 5.0.19unknown2005-12-211-2/+2
| | |
* | | Merge mysql.com:/home/mydev/mysql-5.0unknown2005-12-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug10932 configure.in: Auto merged
| * | | Update ndb version in configure.inunknown2005-12-131-1/+1
| | | |
* | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug10932 configure.in: Auto merged sql/mysql_priv.h: Auto merged
| * | | Bump version number following 5.0.17 release clone-offunknown2005-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | configure.in: Bump version number following release clone-off
* | | | Bug#10932 - Building server with key limit of 128, makes test cases failunknown2005-12-021-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for configuration of the maximum number of indexes per table. Added and used a configure.in macro. Replaced fixed limits by the configurable limit. Limited MyISAM indexes to its hard limit. Fixed a bug in opt_range.cc for many indexes with InnoDB. Tested for 2, 63, 64, 65, 127, 128, 129, 255, 256, and 257 indexes. Testing this part of the bugfix requires rebuilding of the server with different options. This cannot be done with our test suite. Therefore I added the necessary test files to the bug report. If you repeat the tests, please note that the ps_* tests fail for everything but 64 indexes. This is because of differences in the meta data, namely field lengths for index names etc. config/ac-macros/misc.m4: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Added a macro for the new build option. configure.in: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Added a call for the new macro. include/myisam.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Limit the number of keys for MyISAM to its hard limit. sql/mysql_priv.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Stick with the optimized Bitmap<64> if indexes are limited to 64 or lower. Otherwise use a bigger bitmap. It must be defined as a multiple of 8. sql/opt_range.cc: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Initialize an object element to avoid a crash when using InnoDB with many indexes. sql/unireg.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Replace the fixed limit by the configurable limit. tests/mysql_client_test.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Replace the fixed limit by the configurable limit.
* | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheckunknown2005-11-191-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
| * | configure.in:unknown2005-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Corrected "include/readline" link for "make distcheck" configure.in: Corrected "include/readline" linke for "make distcheck"
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-191-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck configure.in: Auto merged
* | \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-191-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
| * | | | Additional "make distcheck" changes specific to 5.0unknown2005-11-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Removed duplicate "tools/Makefile", and unused AVAILABLE_LANGUAGES_ERRORS Docs/Makefile.am: Add generated files to explicitly be removed on "make distclean" extra/Makefile.am: Added empty SUBDIRS, else automake 1.6.3 will not put out code for DIST_SUBDIRS handling extra/yassl/Makefile.am: "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type extra/yassl/src/Makefile.am: "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type extra/yassl/taocrypt/src/Makefile.am: "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type sql/share/Makefile.am: Added distclean target for "*/errmsg.sys" client/Makefile.am: Put links into current directory, not \$(srcdir)
| * | | | Mergeunknown2005-11-041-1/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Auto merged client/Makefile.am: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged support-files/Makefile.am: Auto merged
| | * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-041-3/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck Makefile.am: Auto merged configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| | | * | | Makefile.am, configure.in:unknown2005-09-241-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable "make distcheck" to work configure.in: Enable "make distcheck" to work Docs/Makefile.am: Enable "make distcheck" to work Makefile.am: Enable "make distcheck" to work client/Makefile.am: Enable "make distcheck" to work cmd-line-utils/libedit/Makefile.am: Enable "make distcheck" to work include/Makefile.am: Enable "make distcheck" to work libmysql/Makefile.am: Enable "make distcheck" to work libmysql_r/Makefile.am: Enable "make distcheck" to work libmysqld/Makefile.am: Enable "make distcheck" to work libmysqld/examples/Makefile.am: Enable "make distcheck" to work mysql-test/Makefile.am: Enable "make distcheck" to work ndb/docs/Makefile.am: Enable "make distcheck" to work netware/Makefile.am: Enable "make distcheck" to work pstack/Makefile.am: Enable "make distcheck" to work scripts/Makefile.am: Enable "make distcheck" to work sql-bench/Makefile.am: Enable "make distcheck" to work sql/Makefile.am: Enable "make distcheck" to work sql/share/Makefile.am: Enable "make distcheck" to work support-files/Makefile.am: Enable "make distcheck" to work
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-11-171-0/+13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean client/mysql.cc: Auto merged configure.in: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged mysql-test/r/mix_innodb_myisam_binlog.result: Resolve conflict sql/item_func.cc: Resolve conflict sql/sql_show.cc: Resolve conflicts
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-12640unknown2005-11-171-0/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged
| | * | | | Don't add optimization flags to CFLAGS if the user specified theirunknown2005-11-021-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | own CFLAGS (ditto for CXXFLAGS). (Bug #12640) configure.in: Only add optimization flags when no CFLAGS (and/or CXXFLAGS) were specified.
* | | | | | Raise the version number to 5.0.17.unknown2005-11-091-2/+2
| | | | | |
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-11-031-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957 configure.in: Auto merged
| * | | | | Bug#13957 yassl: opensrv6c compile failureunknown2005-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added some ifdefs and turn off auto template instantiation, use explicit template instantiation configure.in: Use -Tno_implict to indicate that we specifiy which template should be instantiated. Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION extra/yassl/src/socket_wrapper.cpp: Include sys/filio.h if __SCO_VERSION__ is defined extra/yassl/src/timer.cpp: Dont' include files from within namespace yaSSL.
View Lorry Controller Status