evgen@moonbone.local
82369c4e65
Manual merge
2006-06-28 19:34:04 +04:00
evgen@moonbone.local
9a9224da68
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 14:53:41 +04:00
kent@mysql.com
ef2860e8ff
mysql.spec.sh:
...
Disable the simplistic auto dependency scan for test/bench (bug#20078)
2006-06-23 00:37:31 +02:00
joerg@trift2.
5eea972046
Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1
2006-06-22 12:22:52 +02:00
joerg@mysql.com
27df8b07b7
Fix for bug#18516 (also #19353 , reported for 5.1):
...
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
2006-06-20 22:40:46 +02:00
kent@mysql.com
34d82f0bc6
make_win_src_distribution.sh:
...
Removed reference to missing "tools" directory
mysql.spec.sh:
Changed flag --with-yassl => --with-ssl
Reverted accidental removal of the "make" call :-)
Configure --with-embedded-server
Corrected path to "libtool" command
Corrected path to "libmysqld.a"
Removed references to "safe_mysqld"
2006-06-20 12:24:12 +02:00
brian@zim.(none)
ca63edc88b
Removing mysql_explain_log from 5.1
2006-05-23 17:26:56 -07:00
kent@mysql.com
49a8f9ee29
Merge
2006-05-21 10:38:59 +02:00
kent@mysql.com
0a778b4ce0
Merge
2006-05-21 00:47:08 +02:00
kent@mysql.com
2419732379
Merge
2006-05-20 23:36:17 +02:00
kent@mysql.com
e09910f91f
mysql.spec.sh:
...
Always compile position independent
2006-05-20 22:47:20 +02:00
kent@mysql.com
d48e55eefd
Merge
2006-05-17 23:41:56 +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
tomas@poseidon.ndb.mysql.com
b592d872ec
Merge jonas@perch:src/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-05-16 11:31:10 +02:00
tomas@poseidon.ndb.mysql.com
9e883ac3d7
Merge jonas@perch:src/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-16 11:05:50 +02:00
kent@mysql.com
a31d16abe8
Merge mysql.com:/data0/mysqldev/my/tmp_merge
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-16 01:59:09 +02:00
kent@mysql.com
9a93dce158
Merge
2006-05-10 22:15:08 +02:00
kent@mysql.com
237f4a37d8
mysql.spec.sh:
...
Compile in all character sets in Max (bug#14918)
2006-05-10 21:53:01 +02:00
jonas@perch.ndb.mysql.com
fddbcb2bf8
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-05-08 07:56:26 +02:00
jonas@perch.ndb.mysql.com
a5fc03387a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-05-08 07:48:08 +02:00
tomas@poseidon.ndb.mysql.com
f6ede396c0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:55:12 +02:00
kent@mysql.com
b050f975c4
Merge
2006-05-02 02:45:04 +02:00
kent@mysql.com
e8fb05845b
Merge
2006-05-01 20:16:19 +02:00
kent@mysql.com
f45d6d3cc6
mysql.spec.sh:
...
Use "./libtool --mode=execute" to find real path to executables
2006-05-01 19:48:31 +02: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
kent@mysql.com
b714a0cec4
mysql.spec.sh:
...
Backport of changes in 5.0 (bug#18294)
2006-04-29 01:28:04 +02:00
kent@mysql.com
50e8ba04cf
mysql.spec.sh:
...
Include and run mysql_upgrade if needed (bug#19353)
2006-04-28 17:03:11 +02:00
jonas@perch.ndb.mysql.com
59bced7f8a
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-26 15:16:21 +02:00
jonas@perch.ndb.mysql.com
5d5a947f4c
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-26 15:13:43 +02:00
jonas@perch.ndb.mysql.com
a8f407a7ef
Add ndb_config to rpm spec
2006-04-26 14:54:20 +02:00
jimw@mysql.com
4cfc378096
Clean up problem in mysql.spec caused by over-aggressive editor word-wrapping
2006-04-13 13:10:00 -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
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
kent@mysql.com
b492d05ee9
Merge
2006-04-04 23:37:44 +02:00
kent@mysql.com
5e28df35af
Merge
2006-04-01 05:53:37 +02:00
kent@mysql.com
02c661dbcc
Makefile.am:
...
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
2006-04-01 05:44:10 +02:00
kent@mysql.com
b1dfda9b7f
mysql.spec.sh:
...
Changed product name from "Community Edition" to "Community Server", bug#17970
2006-03-07 18:53:26 +01:00
kent@mysql.com
16933400fc
mysql.spec.sh:
...
Enabled fast mutexes, now default is off
2006-03-06 14:57:41 +01:00
kent@mysql.com
ab77867efb
Merge
2006-03-06 13:50:52 +01:00
kent@mysql.com
2ffb679a27
mysql.spec.sh:
...
Use installed libz.a to avoid hard to solve static linking problems
2006-03-03 20:30:28 +01:00
kent@mysql.com
7ae10acbc4
mysql.spec.sh:
...
Don't create empty embedded RPM, bug#15769
2006-03-03 03:27:27 +01:00
bpontz@mysql.com
2e82e5aef8
Fix the changelog entry header, format was wrong
2006-02-21 15:39:43 -05:00
kent@mysql.com
281e0d0c6b
mysql.spec.sh:
...
Reintroduced a max build
Limited testing of 'debug' and 'max' servers
Berkeley DB only in 'max'
2006-02-20 03:10:08 +01:00
kent@mysql.com
088bc804aa
mysql.spec.sh:
...
Only install a subset of shared libraries created
2006-02-17 16:38:32 +01:00
joerg@mysql.com
868b1678e7
support-files/mysql.spec.sh : Use "-i" on "make test-force", add missing changelog notes.
2006-02-13 19:07:40 +01:00
joerg@mysql.com
49caf76e59
support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i test-force", changelog.
2006-02-10 18:07:14 +01:00
joerg@mysql.com
ceaf0017e3
support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation.
2006-02-10 17:40:04 +01:00
kent@mysql.com
9f86a9bdcc
Makefile.am:
...
Link with CLIENT_EXTRA_LDFLAGS, enable us to
pass on libtool flags '-full-static' and '-static'
using '--with-client-ldflags' to configure.
mysql.spec.sh:
Pass '-static' to libtool, link static with our
own libraries, dynamic with system libraries.
Link with the bundled zlib.
2006-02-09 03:11:45 +01:00
knielsen@mysql.com
920ac3a094
Modified RPM spec to match new 5.1 debug+max combined community packaging.
2006-02-08 11:42:17 +01:00
kent@mysql.com
2205d1b8d5
mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
...
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
new file
2005-12-19 01:12:11 +01:00
