brian@zim.(none)
41f920b013
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 21:26:33 -07:00
kostja@bodhi.local
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
brian@zim.(none)
e8289bfbc1
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-10 13:44:04 -07:00
serg@janus.mylan
069131e28a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into janus.mylan:/usr/home/serg/Abk/m51
2006-08-10 12:39:59 +02:00
serg@janus.mylan
7d77c53038
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/m51
2006-08-10 11:04:09 +02:00
brian@zim.(none)
c37e1b4839
First stage removeal of BDB.
2006-08-09 17:33:08 -07:00
kroki/tomash@moonlight.intranet
5c272816ca
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-09 13:37:20 +04:00
msvensson@neptunus.(none)
31be565d2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
serg@janus.mylan
12dc638abd
compile-time definition of intptr type
2006-08-01 14:02:19 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
4a461fdae3
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-07-29 17:40:10 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5d948f5ec4
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-29 17:26:06 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f2ec5d7128
configure.in:
...
Corrected typo
2006-07-29 17:24:48 +02:00
kroki/tomash@moonlight.intranet
5c90b6f810
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00
jimw@rama.(none)
f7e19b40f3
Merge rama.(none):/home/jimw/my/tmp_merge
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2faea98324
Makefile.am, configure.in:
...
Man page for mysqld command move to section 8 (bug#21220)
2006-07-28 23:12:40 +02:00
ingo/mydev@chilla.local
8bb8069653
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-24 10:05:17 +02:00
msvensson@maint1.mysql.com
f1ef4af700
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/my50-bug19517
...
into maint1.mysql.com:/data/localhome/msvensson/my50-bug19517
2006-07-20 14:11:37 +02:00
joerg@trift2.
5620f8e0a6
Increment the version number to 4.1.22, as 4.1.21 is cloned.
2006-07-14 17:55:34 +02:00
kostja@bodhi.local
d7845b74db
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 22:09:36 +04:00
cmiller@zippy.(none)
2c5308a703
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-13 11:11:20 -04:00
cmiller@zippy.(none)
4980c64a5b
Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470
...
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-12 11:39:12 -04:00
cmiller@calliope.local
834111811b
Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops
...
The bug is thqt we use some nonstandard assembly codes in our strings
source, and some assemblers don't know what to do with them: Specifically,
Sun's Solaris assembler and Apple's Darwin assembler balk at them.
This patch, rather than trying to test for properties of the assembler,
which Autoconf doesn't have any decent facilites for, instead tries to
compile the code in question and disables assembly if it fails.
There's still the problem of unportable assembly, but I'll leave that
to someone who feels like rewriting and debugging it.
2006-07-12 10:26:19 -04:00
joerg@trift2.
6b9e4ff960
Raise the version number.
2006-07-11 12:34:43 +02:00
cmiller@zippy.(none)
8ea01fbca8
Add a more reliable "getconf" test for Linuxthreads. The later trees should already
...
have a better test (and so this should be null-merged there).
ALSO! Make it so that it accepts NPTL as a valid _equivalent_ implementation.
2006-07-07 16:47:57 -04:00
elliot@mysql.com
68db32613b
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2006-06-30 00:14:25 -04:00
joerg@mysql.com
1054e8f66e
Increment the version number.
2006-06-29 16:38:14 +02:00
acurtis@xiphis.org
f242546e85
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
...
into xiphis.org:/home/antony/work2/p4-bug12096.2-merge
2006-06-28 09:54:40 -07:00
iggy@mysql.com
578fee6990
Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter
2006-06-27 18:07:23 -04:00
acurtis@ltamd64.xiphis.org
d2b5205b65
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
...
into xiphis.org:/home/antony/work2/p4-bug12096.3
2006-06-22 11:00:01 -07:00
kent@mysql.com
392bb51f25
configure.in, net_serv.cc, compile-netware-END:
...
Changes for Netware
2006-06-17 00:30:02 +02:00
serg@serg.mylan
3c609f0aa3
don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
...
don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts
2006-06-15 21:43:29 +02:00
msvensson@neptunus.(none)
4ca95f911a
Bug#19517 No simple way to detect wether server was compiled with libdbug
...
- Define DBUG_ON and DBUG_OFF in config.h
2006-06-12 13:07:40 +02:00
serg@serg.mylan
5409997d49
unittest:
...
rename *.t* to *-t* to be automake-friendly
simplify Makefiles
test_atomic.c:
move to unittest, add GPL comment, fix warnings, convert to tap framework.
configure:
remove custom tests for available types, use AC_CHECK_TYPE instead
x86-gcc.h:
fix gcc -ansi errors while maintaining readability
ignore:
added *-t
2006-06-01 12:25:47 +02:00
serg@serg.mylan
efdf221d49
WL#2595 - atomic operations
2006-05-31 18:44:09 +02:00
acurtis@xiphis.org
23e612ae11
Bug#12096
...
"Add line for non-executable stack in .s files"
Fix so that configure will use "--noexecstack" for assembler if gcc supports
option and compiled C doesn't need executable stack.
2006-05-31 00:07:58 -07:00
kent@mysql.com
7ffc786686
configure.in:
...
Update NDB version as well
2006-05-24 12:30:34 +02:00
kent@mysql.com
22a52ede3f
configure.in:
...
Stepped up to 5.0.23
2006-05-24 12:28:34 +02:00
kent@mysql.com
eb627531f3
configure.in:
...
Stepped up to 4.1.22
2006-05-24 12:20:17 +02:00
joerg@trift-lap.fambruehe
4b5b65b666
Bump up the version number, 5.1.11 has been cloned.
2006-05-22 22:58:01 +02:00
kent@mysql.com
d0f40d7d72
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-20 00:09:08 +02:00
kent@mysql.com
d48e55eefd
Merge
2006-05-17 23:41:56 +02:00
msvensson@neptunus.(none)
f4567f9f92
BUG#18818 configure: No longer finds OpenSSL on Mac OS X
...
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL
2006-05-17 13:59:37 +02:00
kent@mysql.com
9fca0d766b
mysql.spec.sh:
...
Removed Berkeley DB
configure.in:
Adjusted Netware support
basic.t.c:
Change for Netware
Makefile.am:
Use thread safe libmysqlclient_r if it was built
valgrind.supp:
Hide report about strlen/_dl_init_paths
ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
net_serv.cc:
Include <sys/select.h> for Netware
2006-05-16 22:47:22 +02:00
kent@mysql.com
39516f3886
configure.in:
...
Stepped up to 4.0.28
2006-05-11 19:48:57 +02:00
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