Commit graph

978 commits

Author SHA1 Message Date
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
1b4e19f3e6 Increase version number (prepare for new build including security fixes in "zlib"). 2005-07-29 11:54:22 +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
lenz@mysql.com
c760d27cf1 - bumped up version number in configure.in to 4.0.26 2005-07-04 12:58:53 +02:00
kent@mysql.com
22fd02d157 configure.in:
Enable build with CXX=gcc and gcc version 4
2005-07-02 02:00:56 +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
msvensson@neptunus.(none)
08d8be1461 Cset exclude: matt@mysql.com|ChangeSet|20050519052223|06259
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050425090838|60886
2005-05-19 23:52:17 +02:00
matt@mysql.com
8091707afe configure.in:
Increment to next version.
2005-05-19 07:22:23 +02:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
monty@mysql.com
db40af2a6f Fix warnings from icc
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
2005-05-18 19:00:21 +03:00
matt@mysql.com
8ed0aaacdf Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-05-18 04:06:27 +02:00
serg@serg.mylan
56fa40e558 sql_yacc.yy:
missing semicolon added
sql_base.cc:
  bad merge fixed
sp_head.cc, view.test, view.result:
  Correct restoring view name in SP table locking BUG#9758
configure.in:
  restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
2005-05-17 17:08:43 +02:00
msvensson@neptunus.(none)
ffd6f926ca Build fixes 2005-05-16 11:24:41 +02:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
lenz@mysql.com
f6593cb7d4 - added a check for "u_int32_t" to configure.in that will define
HAVE_U_INT32_T when available (needed to fix a double typedef in
  libedit)
2005-05-12 18:18:37 +02:00
kent@mysql.com
7c65e20e32 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 13:56:08 +02:00
kent@mysql.com
faf8f825b5 Makefile.am, configure.in:
Enable creation of embedded lib when --with-darwin-mwcc
2005-05-10 13:53:47 +02:00
kent@mysql.com
2f9a28b4cc configure.in:
Bumped up version number to indicate 4.1.12 was branched off
2005-05-09 18:14:10 +02:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem;
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
2005-05-07 11:35:14 +02:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
serg@sergbook.mylan
6b053194db Merge bk-internal:/home/bk/mysql-5.0
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-05 16:22:32 +02:00
serg@sergbook.mylan
83dfc216a7 gcc 2.92 compatibility 2005-05-05 16:21:17 +02:00