msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
bb571de368
BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
2005-10-27 21:48:43 +02:00
msvensson@neptunus.(none)
0684dc1342
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
2005-10-18 15:43:59 +02:00
gluh@eagle.intranet.mysql.r18.ru
4b2a0f0c70
after merge fix
2005-10-12 13:18:46 +05:00
tomas@poseidon.ndb.mysql.com
e72fdf5619
Merge
2005-10-07 01:12:46 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
tomas@poseidon.ndb.mysql.com
b5ac7f31e5
added structured ndbd exit codes
2005-10-03 20:04:44 +02:00
msvensson@neptunus.(none)
545e38535b
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-27 17:05:12 +02:00
msvensson@neptunus.(none)
eaf4801bfc
Bug #12526 yassl: Crashes in "integer.cpp"
...
- Improve detection of when to disable inlining for integer.cpp
2005-09-27 17:03:43 +02:00
shuichi@mysql.com
a5a4c412f1
Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/shuichi/apps/mysql/bk/mysql-5.0b
2005-09-21 11:18:04 -07:00
msvensson@neptunus.(none)
dc0e1d83e1
Merge neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
...
into neptunus.(none):/home/msvensson/mysql/bug12526/my51-bug12526
2005-09-15 09:09:10 +02:00
msvensson@neptunus.(none)
95197f39a2
Bug #12526 yassl: Crashes in "integer.cpp"
...
- Disable inlining in integer.cp for sparc solaris Cun C++ 5.6
2005-09-15 08:59:29 +02:00
shuichi@mysql.com
63cdcbc0ec
Fix for Bug#3982
...
Added check for availability of multibyte characters and functions
2005-09-14 21:47:24 -07:00
ndbdev@dl145c.mysql.com
4e8595862d
Merge
2005-09-13 05:33:11 +02:00
bar@mysql.com
833bccfe57
Many files:
...
Adding esperanto collation
2005-09-12 19:35:50 +05:00
msvensson@neptunus.(none)
4f4b6f1e76
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-07 09:39:38 +02:00
brian@zim.(none)
e6bb90d618
Fixed a typo in the configure --help menu.
2005-09-06 23:32:00 -07:00
brian@zim.(none)
82337d1d1e
Fixed partition push so that it now compiles. The sinclude directory was not added which means that though the code was in the tree, it never actually compiled. I did make sure that it compiles, but there are no tests to really test functionality at this point.
2005-09-02 16:01:26 -07:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
stewart@mysql.com
9bd662624c
Fix merge of BUG#11538 fix.
2005-08-18 16:47:41 +10:00
mronstrom@mysql.com
67087e2aa7
Patch for push of wl1354 Partitioning
2005-07-18 13:31:02 +02:00
serg@serg.mylan
1736483435
Merge
2005-07-17 21:34:57 +02:00
ndbdev@dl145b.mysql.com
dcef1c7532
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-22 19:07:29 +02:00
svoj@mysql.com
c275bde204
Better AR guessing.
2005-06-22 16:29:21 +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
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
ndbdev@dl145b.mysql.com
0257d41da1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-13 20:35:38 +02:00
svoj@mysql.com
685c844fc4
WL#2286 - Compile MySQL w/YASSL support
...
Fix for link failures on boxes with non-gnu compiler.
2005-06-12 18:18:46 +05:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4
Merge
2005-06-04 19:26:35 +02:00
svoj@mysql.com
681b974b1e
WL#2286 - Compile MySQL w/YASSL support
...
Compilation errors fixes.
2005-06-03 00:28:18 +05:00
tulin@dl145c.mysql.com
03590c20bd
merge
2005-05-18 22:26:23 +02: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
lars@mysql.com
05cbb3962c
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
serg@sergbook.mylan
83dfc216a7
gcc 2.92 compatibility
2005-05-05 16:21:17 +02:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 00:10:52 +02:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-02 13:18:26 +02:00
serg@serg.mylan
530b6ba541
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
jimw@mysql.com
f35c1a1874
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-29 11:47:30 -07:00
serg@serg.mylan
e9b0411110
Merge
2005-04-29 15:44:24 +02:00
svoj@mysql.com
c1fd1d6a5b
WL#2286 Compile MySQL w/YASSL support
...
yaSSL-0.9.7 library bundled.
2005-04-28 18:23:27 +05:00
jimw@mysql.com
63fa61c6e2
Carry over change to fix build on ICC that was lost in merge from 4.1.
2005-04-27 10:01:41 -07:00
brian@zim.(none)
3e4607a3b8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
brian@zim.(none)
2193fd8666
All changes for change to all storage engines being under storage directory.
2005-04-26 19:04:36 -07:00
jimw@mysql.com
64f8ebc68b
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-26 10:29:58 -07:00
jimw@mysql.com
fcc04b2ffd
Merge changes to acinclude.m4 that are now in config/ac-macros/misc.m4
2005-04-26 08:23:42 -07:00
joerg@mysql.com
1523119091
Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
2005-04-26 12:16:12 +02:00
joerg@mysql.com
fc0e6aa274
Manual transfer of the change in "configure.in" (4.1) to "config/ac-macros/character_sets.m4".
2005-04-11 11:24:30 +02:00
serg@sergbook.mylan
2b8ff6949f
delete isam/merge files
2005-04-04 17:58:21 +02:00
joerg@mysql.com
37fd05fe49
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0
2005-03-29 21:13:56 +02:00
joerg@mysql.com
c4726b9e20
Implement the new '--with-big-tables' flag to "configure".
...
Using it comes merged from 4.1.
2005-03-29 21:11:52 +02:00