Commit graph

843 commits

Author SHA1 Message Date
jimw@mysql.com
d6db387aea Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 19:12:16 -07:00
jimw@mysql.com
37bf8394ab Add test for madvise() being declared in C++ code, because it is not
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156)
2005-08-31 10:08:55 -07:00
kent@mysql.com
01f3a901a9 configure.in:
Changed back to 5.0.13-beta
2005-08-31 03:45:04 +02:00
joerg@mysql.com
2d494220db Reverted a change that breaks "automake". 2005-08-25 18:48:18 +02:00
joerg@mysql.com
1a4e2ef94b Reset version number in the build clone. 2005-08-25 16:57:54 +02:00
jimw@mysql.com
e11e73173f Fix for building without --without-server, which was broken by fix
for building with --without-server.
2005-08-24 17:08:55 -07:00
jimw@mysql.com
6964b7491e Merge mysql.com:/home/jimw/my/mysql-5.0-11680
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 15:54:23 -07:00
joerg@mysql.com
6fcc98ddb5 Increase version number (but leave status still at "beta"). 2005-08-24 13:41:34 +02:00
jimw@mysql.com
cf5dd176c0 Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
tomas@poseidon.ndb.mysql.com
83664a8365 configure.in:
fixed build bug with ndb grep block
2005-08-23 13:01:46 +02:00
serg@sergbook.mysql.com
1fbb96ea97 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-08-23 14:16:17 +04:00
tomas@poseidon.ndb.mysql.com
653e99dea2 removed ndb grep from configure .in 2005-08-23 12:16:16 +02:00
serg@sergbook.mysql.com
eadb86d56f after pull cleanup 2005-08-22 13:20:02 +04:00
elliot@mysql.com
55b81af671 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/home/emurphy/src/work/mysql-5.0
2005-08-19 15:29:30 -04:00
joerg@mysql.com
09a3d58987 Increase the version number to 4.1.15 (as 4.1.14 has been cloned off). 2005-08-17 15:03:29 +02:00
serg@sergbook.mysql.com
2870638ef2 client/mysql.cc
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
    autoconf 2.52 is enough to build mysql-5.0
2005-08-14 14:06:47 +02:00
serg@serg.mylan
8e5b5d3be7 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-08-06 22:04:32 +02:00
joerg@mysql.com
9959482c95 Ensure version is 5.0.12 (block the clone's "11" from the main tree). 2005-08-05 21:13:06 +02:00
joerg@mysql.com
23603ca7cb Reset the version to 5.0.11 (this is within the updated clone). 2005-08-05 16:35:04 +02:00
lenz@mysql.com
a6182100f1 - Bumped up version number to 5.0.12-beta to indicate the 5.0.11 release build branchoff 2005-08-04 15:20:03 +02:00
serg@serg.mylan
8eb3eacc38 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-07-31 21:11:51 +02:00
joerg@mysql.com
58a6214560 Upgraded the version number, as 5.0.10 is cloned off.
This push includes the clone tag.
2005-07-20 18:31:33 +02:00
konstantin@mysql.com
52ba7b69d7 After-merge fixes. 2005-07-19 03:01:25 +04:00
konstantin@mysql.com
52b8928b09 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
konstantin@mysql.com
8b3d39163a Alleviate the autoconf requirement. 2005-07-18 18:03:58 +04:00
serg@serg.mylan
1736483435 Merge 2005-07-17 21:34:57 +02:00
georg@lmy002.wdf.sap.corp
9293bdc849 fix for bug#11893
increased version number for shared lib to 15
2005-07-16 00:23:33 +02:00
joerg@mysql.com
ae949ccdd5 4.1.13 has been cloned off 2005-07-13 15:55:22 +02:00
joerg@mysql.com
8b2f9e8f25 Increase version number to 5.0.10, as 5.0.9 has been cloned off. 2005-07-06 12:54:22 +02:00
msvensson@neptunus.(none)
289553f3ec Bump required version of autoconf to 2.58 2005-06-29 16:41:49 +02:00
kent@mysql.com
7817b69d80 configure.in:
Enable build with CXX=gcc and gcc version 4
2005-06-28 04:44:27 +02:00
lenz@mysql.com
4bbb39ac8c - bumped up version number to 5.0.9 now that the 5.0.8 builds have been branched off 2005-06-23 22:41:26 +02:00
svoj@mysql.com
367017d630 WL#2286 - Compile MySQL w/YASSL support
Fix for compilation failure with Forte Developer C++.
2005-06-23 21:29:44 +05:00
svoj@mysql.com
c275bde204 Better AR guessing. 2005-06-22 16:29:21 +05:00
svoj@mysql.com
55ae33e8f4 Better comment. 2005-06-22 15:10:12 +05:00
svoj@mysql.com
74373e7d54 WL#2286 - Compile MySQL w/YASSL support
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
2005-06-22 14:08:28 +05:00
svoj@mysql.com
7660f609e6 WL#2286 - Compile MySQL w/YASSL support
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.

Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
2005-06-19 21:46:44 +05:00
serg@serg.mylan
271f9e484d config/ac-macros/yassl.m4: fix --without-yassl
configure.in:                  fix --without-darwin-mwcc
2005-06-18 16:10:53 +02:00
joerg@mysql.com
bd0386839c "configure.in": Correct equality comparison: In shell 'test', it is single '=' (bug#11007). 2005-06-16 13:44:08 +02:00
jimw@mysql.com
153f233627 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 19:27:45 -07:00
jimw@mysql.com
927418b199 Make sure we don't mistake a "grep mysqld" for a mysqld process
when checking if the server is running in mysqld_safe. (Bug #11122)
2005-06-08 18:57:39 -07:00
joerg@mysql.com
bccd45ca03 Builds of 5.0.7 have begun, so anything added into this tree here will go into 5.0.8. 2005-06-07 19:28:43 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3 - removed references to some obsolete files (BUG#10824)
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)
2005-06-01 12:59:10 +02:00
lenz@mysql.com
c58535f6d3 - merged the 4.1.12a Changes back into the main tree 2005-05-26 11:43:47 +02:00
lenz@mysql.com
4a296d4f00 - bumped up version number string to 4.1.12a 2005-05-24 15:14:21 +02:00
msvensson@neptunus.(none)
3f97312341 Change to 5.0.7(again) 2005-05-20 00:04:43 +02:00