joerg@mysql.com
61748a0ca2
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-05-08 23:36:22 +02:00
joerg@mysql.com
7ace714142
configure.in : Now that 5.1.10 has been cloned, bump up the version.
2006-05-08 23:34:54 +02:00
serg@sergbook.mysql.com
147f43d774
merged
2006-05-08 13:41:43 -04:00
serg@sergbook.mysql.com
376117eb98
auto-include plug.in, remove the need for plugins to modify configure.in
2006-05-04 17:14:56 -04:00
monty@mysql.com
c10f37673c
Fixed compiler warnings
...
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks
2006-05-04 19:39:47 +03:00
acurtis@xiphis.org
f1d4921139
WL#3201 additional post-review fixes
2006-05-02 04:11:00 -07: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
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@shellback.(none)
e5004d1312
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-27 17:35:29 +02:00
kent@mysql.com
dd2165f6b9
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-27 11:38:48 +02:00
msvensson@neptunus.(none)
2c3a3bd87f
Remove hacks for building shared libs on aix and qnx
2006-04-26 12:16:57 +02:00
bpontz@mysql.com
92825f3ada
configure.in:
...
clone-off for 5.0.21
2006-04-26 08:26:33 +02: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
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
msvensson@shellback.(none)
56f1424c1a
Fix for building shared libraries on AIX with 64-bit mode
...
Set building of shared libraries on QNX to defatul OFF
2006-04-22 21:53:33 +02:00
msvensson@neptunus.(none)
8786a1258f
Merge neptunus.(none):/home/msvensson/mysql/my50-bug18837
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-21 09:47:21 +02:00
acurtis@xiphis.org
35166137f0
WL#3201
...
Fixes after first review
2006-04-20 10:03:15 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-19 21:22:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
22ed19e434
WL 2826: Error handling of ALTER TABLE for partitioning
...
Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
+Small fixes
2006-04-19 12:05:44 -04:00
kent@mysql.com
543960f2fb
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-19 15:41:56 +02:00
acurtis@xiphis.org
4e11a4d941
WL#3201
...
" Configure support for server plugins "
2006-04-13 13:49:29 -07:00
jimw@mysql.com
66c29e0f49
Merge mysql.com:/home/jimw/my/mysql-5.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
2006-04-13 10:37:57 -07:00
jimw@mysql.com
55727ef6d0
Remove sql-bench from the server repository -- it is being maintained
...
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
2006-04-13 10:34:46 -07:00
mats@mysql.com
d05769e126
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-04-13 17:48:53 +02:00
bell@sanja.is.com.ua
cb81389aef
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-13 15:07:50 +03:00
mats@mysql.com
0bd7349557
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/merge-mysql-5.1-wl3206
2006-04-13 13:25:58 +02:00
msvensson@neptunus.(none)
f3373899e2
Bug#18837 Many build and test failures when configuring without --disable-shared
...
Build "NOINST" tools with -static flag to avoid any ld problems when using them
2006-04-13 13:02:58 +02:00
serg@serg.mylan
d65ccb4493
merged
2006-04-13 10:24:44 +02:00
serg@serg.mylan
e3b9c80449
fix for distcheck
2006-04-13 09:57:51 +02:00
serg@serg.mylan
601d707661
Auto merged
2006-04-12 14:14:03 +02:00
serg@serg.mylan
70c2ff34f7
fixes for 'make dist' and 'make distcheck'
2006-04-12 14:08:24 +02:00
jimw@mysql.com
276109b155
Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
...
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
bell@sanja.is.com.ua
b4980d4383
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-04-11 14:49:33 +03:00
brian@zim.(none)
eaf850ef5b
Drop a number of OS2 specific files.
2006-04-10 17:48:19 -07:00
bell@sanja.is.com.ua
5fe95af804
Avoid trying to include <asm/atomic.h> when it doesn't work in C++
...
code. (Bug #13621 )
2006-04-10 21:57:29 +03:00
bpontz@shasta.mysql.com
1ec9119308
configure.in:
...
increase version number for clone
2006-04-07 08:54:16 -04:00
mats@mysql.com
32c697806f
WL#3206 (Adding unit tests):
...
Moving mytap library into unittest/
Adding 'test' target to make and run unit tests.
Minor fixes.
2006-04-06 17:18:12 +02:00
kent@mysql.com
2d8f8ac6e1
configure.in:
...
Check for crypt() in libc first (bug#16478)
2006-04-06 00:43:58 +02:00
mats@mysql.com
02ffd18af6
WL#3206 (Add unit tests):
...
An implementation of the TAP framework for writing unit tests.
2006-04-04 18:16:15 +02:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
0a02cbb5f6
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-01 16:31:53 -05:00
acurtis@xiphis.org
6cbd57914a
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/antony/work2/p1-bug18464
2006-03-29 17:31:59 -08:00
bpontz@mysql.com
c1ac02a424
configure.in:
...
Increased version number because of clone-off
2006-03-29 22:20:16 +02:00
acurtis@xiphis.org
f6febdb95a
Bug#18464
...
"Can't make example storage engine available"
Build was attempting a shared-lib build instead of static
2006-03-28 14:34:28 -08:00
knielsen@mysql.com
cc57e4e01b
Manual merge.
2006-03-28 10:07:03 +02:00
dlenev@mysql.com
e7d2b09e14
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 19:03:09 +03:00
kent@mysql.com
625ab8a064
configure.in:
...
AC_ARG_WITH inside "if" sometimes gives unexpected result,
--with-fast-mutexes was not ignored when --with-debug given
2006-03-25 13:38:37 +01:00
bpontz@shasta.mysql.com
676580c29d
changed version number
2006-03-24 18:24:04 -05:00