mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45338 commits 2781 branches 343 tags 1.6 GiB
Commit graph

166 commits

Author SHA1 Message Date
acurtis@xiphis.org
16d8d6bcca fix legacy configure option handling 2006-05-03 15:58:15 -07:00
serg@sergbook.mysql.com
375d3e8258 Fixed dependency checking 2006-05-03 09:46:19 -04:00
acurtis@xiphis.org
20b687ce0d WL#3201 post-review fixups 2006-05-02 12:04:20 -07:00
acurtis@xiphis.org
f1d4921139 WL#3201 additional post-review fixes 2006-05-02 04:11:00 -07:00
holyfoot@mysql.com
128593f0c2 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.18518
 2006-05-02 14:36:05 +05:00
acurtis@xiphis.org
09c7374d69 Merge xiphis.org:/home/antony/work2/mysql-5.1 
into  xiphis.org:/home/antony/work2/wl3201-post-review.2
 2006-05-01 22:45:31 -07:00
acurtis@xiphis.org
0736d18337 WL#3201 post-review fixups 
end plugin/module naming schizophrenia
  fixup shell code and m4 macro comments
  cmakelists.txt included in EXTRA_DIST
 2006-05-01 21:33:09 -07:00
jimw@mysql.com
b4586b2908 Clean up after big merge 2006-05-01 00:14:32 -07:00
jimw@mysql.com
f21c110d13 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-30 13:27:38 -07:00
serg@sergbook.mysql.com
506f9800bd fixes 2006-04-30 15:52:30 -04:00
serg@sergbook.mysql.com
281fb1cfc5 make distcheck and cosmetic fixes 2006-04-29 09:33:34 -07:00
msvensson@neptunus.(none)
50c920ffab Bug#18818 configure: No longer finds OpenSSL on Mac OS X 
- Eval shrext_cmds variable before using it
 - Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0
 2006-04-28 13:55:40 +02:00
holyfoot@mysql.com
06b57c4871 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.18518
 2006-04-27 15:07:36 +05:00
acurtis@xiphis.org
e2ac9dda83 WL#3201 
post-merge fixes
 2006-04-24 14:32:45 -07:00
acurtis@xiphis.org
53d4594cfe Merge xiphis.org:/home/antony/work2/wl3201.3 
into  xiphis.org:/home/antony/work2/wl3201.merge
 2006-04-24 13:36:15 -07:00
holyfoot@deer.(none)
25f56ce8b4 bug #18518 (embedded server crashes starting) 
The problem is that now server works properly only with the 
row-based replication
 2006-04-24 19:39:33 +05:00
bell@sanja.is.com.ua
b2c810e847 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
 2006-04-24 13:32:07 +03:00
acurtis@xiphis.org
35166137f0 WL#3201 
Fixes after first review
 2006-04-20 10:03:15 -07:00
msvensson@neptunus.(none)
ab62f848ec Merge 192.168.0.20:mysql/my50-yassl_3/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-19 14:15:17 +02:00
acurtis@xiphis.org
4e11a4d941 WL#3201 
" Configure support for server plugins "
 2006-04-13 13:49:29 -07:00
bell@sanja.is.com.ua
df69944e73 postmerge fix: added tinfo support. 2006-04-13 16:06:52 +03:00
serg@serg.mylan
70c2ff34f7 fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00
msvensson@shellback.(none)
1c4e31d5fe Add new yaSSL files 
Add benchmark, testsuite and taocrypt/test as places where to 
produce Makfiles and build - very useful for debugging
 2006-04-11 23:51:14 +02:00
kent@mysql.com
1f88c4e5df Merge mysql.com:/Users/kent/mysql/bk/tmp_merge 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-05 10:39:44 +02:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
serg@serg.mylan
a1bf113868 yassl link problem fixed 2006-04-03 12:07:18 +02:00
kent@mysql.com
f98de2cc35 zlib.m4: 
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)
 2006-04-01 03:49:14 +02:00
kent@mysql.com
f5a9cc17a1 Makefile.am, yassl.m4: 
Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
 2006-04-01 01:24:28 +02:00
kent@mysql.com
50b0868141 zlib.m4, openssl.m4: 
Use  when testing if shared library exists, bug#16332
 2006-03-31 01:03:45 +02:00
kent@mysql.com
9571e81f04 config-win.h: 
Enable row based replication for Windows build
replication.m4:
  Made help text more clear, default is with row based replication enabled
 2006-02-25 21:27:49 +01:00
joerg@mysql.com
26ddd4fa45 config/ac-macros/ha_ndbcluster.m4 : Get back the message "Using NDB Cluster". 2006-02-15 21:04:42 +01:00
jonas@perch.ndb.mysql.com
ae15f53840 ndb - 
remove removed makefiles
 2006-01-20 15:12:21 +01:00
cps@outpost.site
c08d4aa703 Fix the tree: plugin-related changes, necessary for 
CSV storage engine to be statically compiled.
Derived from antony's patch.
 2006-01-20 00:40:56 +03:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
msvensson@neptunus.(none)
dad7268273 Add yassl libs to libmysqlclient_r as well. 
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)
 2006-01-09 10:01:07 +01:00
msvensson@neptunus.(none)
2362c7314a Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem 
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
 2006-01-04 16:34:03 +01:00
msvensson@neptunus.(none)
5bacd5067f Add yassl libs to libmysqlclient_r as well. 
Add a link to extra/yassl/include/openssl to inlude when compiling with yassl
Similiar to readline)
 2006-01-04 16:33:06 +01:00
lars@mysql.com
ad126d90e0 WL#1012: All changes as one single changeset. 
This includes both code and test cases.
 2005-12-22 06:39:02 +01:00
acurtis@xiphis.org
0f8f444b8b Change for plugin storage engine to be built after mysqld 2005-12-21 14:58:03 -08:00
acurtis@xiphis.org
9d4d1e81b8 Merge xiphis.org:/home/antony/work2/mysql-5.1 
into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
 2005-12-21 10:26:39 -08:00
acurtis@xiphis.org
13a776778c Finalize storage engine plugins 
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
 2005-12-21 10:18:40 -08:00
ingo@mysql.com
b5005d4171 Merge mysql.com:/home/mydev/mysql-5.0-bug10932 
into  mysql.com:/home/mydev/mysql-5.1-bug10932
 2005-12-06 08:31:38 +01:00
ingo@mysql.com
6b18dbef31 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 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.
 2005-12-02 16:27:18 +01:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
msvensson@neptunus.(none)
9a84dcc1ac Include libyassl.la and libtaocrypt.la in libmysqlclient.la 2005-11-28 16:28:00 +01:00
msvensson@devsrv-b.mysql.com
8f457699a8 Bug #15168 yassl failure on amd64 
- Use libtool to build libraries
 2005-11-24 17:17:36 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
pem@mysql.com
7b78489e2d Check for zlib with a zzlibCompileFlags() function in config/ac-macros/zlib.m4. 
(Patch provided by serg)
 2005-11-21 16:05:40 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +02:00
joerg@mysql.com
bf08909aa4 config/ac-macros/zlib.m4 
Accept any shared library for "libz", not just the static one. Bug#6584
Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.
 2005-11-01 20:49:02 +01:00
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