Jonathan Perkin
37ca19e01f
Revert library changes, let's just stick with keeping to existing
...
setup for now, leave large changes to later.
2010-04-08 12:30:04 +02:00
Jonathan Perkin
c7ed531ce6
Expand @HOSTNAME@.
2010-04-01 20:47:19 +02:00
Jonathan Perkin
7cf98dc3c2
RPM doesn't like %install in comments, doh
2010-04-01 15:10:05 +02:00
Jonathan Perkin
a03f41ee13
Fix SVR4 datadir
2010-04-01 14:56:25 +02:00
Jonathan Perkin
990bfbe1e2
Put libmygcc back in %build, needs $CC etc of course...
2010-04-01 13:48:44 +02:00
Jonathan Perkin
f3ebc19a33
Try to fix datadir
2010-04-01 13:35:16 +02:00
Jonathan Perkin
1f5ce2fb1f
Actually, move the libgcc stuff to %install where it belongs.
2010-04-01 12:24:00 +02:00
Jonathan Perkin
d8883b8def
We do need the mkdir.
2010-04-01 12:18:51 +02:00
Jonathan Perkin
3e2c17d244
Just put libs in %{_libdir}.
...
Can't see how mysqld_safe can work with current setup, so make it look
in $pkglibdir/mysql too.
Other cleanups.
2010-04-01 10:32:29 +02:00
Jonathan Perkin
ee85029bbc
Try some more fixes.
2010-04-01 02:20:41 +02:00
Jonathan Perkin
910e84216d
Try a bunch of fixes.
2010-03-31 23:52:49 +02:00
Jonathan Perkin
ccdfb25c80
Need to add .a extension now.
2010-03-31 20:33:28 +02:00
Jonathan Perkin
eca8a74a3e
Put back libmysqlclient_r.a, not sure it was supposed to be removed.
...
Remove libmysqld-debug.a, it doesn't exist in current packages?
2010-03-31 19:04:22 +02:00
Jonathan Perkin
4bfa7af22d
Fix socket path in RPMs. XXX should be put into cmake/* somewhere.
2010-03-31 12:04:21 +02:00
Jonathan Perkin
7ef2f9fa51
Apply wlad fixes from mysql-next-mr-bugfixing
2010-03-31 11:40:02 +02:00
Jonathan Perkin
089ff3dfa9
Back out remains of previous attempt.
2010-03-30 17:24:44 +02:00
Jonathan Perkin
bde4d7d3ee
Fix from wlad.
2010-03-30 17:13:07 +02:00
Jonathan Perkin
08ec0a2a87
Try again..
2010-03-30 13:37:17 +02:00
Jonathan Perkin
736f2eae74
Try to fix the debug permissions stuff.
2010-03-30 12:32:38 +02:00
Jonathan Perkin
0f6794a9d8
Default to CXX=gcc
2010-03-30 12:01:30 +02:00
Jonathan Perkin
45b56ba0f2
Must specify -DDCMAKE_BUILD_TYPE=RelWithDebInfo now that compiler
...
flags are being used correctly.
2010-03-30 11:54:25 +02:00
Jonathan Perkin
91cd9e2637
Variables need to be exported so cmake can pick them up.
2010-03-29 17:54:08 +02:00
Jonathan Perkin
eb96d2fddd
Fix environment setup.
...
Don't create empty ChangeLog.
2010-03-29 17:01:15 +02:00
Jonathan Perkin
285d7ad2f8
Install debug plugins, from wlad.
2010-03-26 17:28:06 +01:00
Jonathan Perkin
a54d5e2409
Install mtr, mysql-test-run and my_safe_process into the correct
...
locations.
2010-03-26 16:11:56 +01:00
Jonathan Perkin
fcc9f31a59
Move libmysqlclient*.a out of the WITH_LIBGCC section.
2010-03-26 11:25:02 +01:00
Jonathan Perkin
9e0643a114
Put back libmysqlclient*.a
...
Add ChangeLog.
2010-03-25 19:54:47 +01:00
Jonathan Perkin
0fed5e3125
Merge latest mysql-5.5.3-m3-release
2010-03-25 17:23:08 +01:00
Jonathan Perkin
d9851896b9
Fix some paths.
2010-03-25 17:15:34 +01:00
Jonathan Perkin
42f3842ef8
Expand INSTALL_INFODIR correctly.
...
Make mysql.info optional.
2010-03-25 15:04:39 +01:00
Jonathan Perkin
9ac7a429ea
Current iteration of spec file cleanup.
2010-03-25 13:29:02 +01:00
Jonathan Perkin
b462a3e0b3
Don't install documentation when INSTALL_LAYOUT=RPM, as the spec file
...
prefers to take docs directly from the source tree.
2010-03-25 13:16:13 +01:00
Jonathan Perkin
651aeb62ec
Add INSTALL_INFODIR and use it to install mysql.info into the
...
correct location.
2010-03-25 11:43:11 +01:00
Jonathan Perkin
21dbbe750a
Fix source layout.
2010-03-24 22:30:39 +01:00
Jonathan Perkin
e97be6d429
Initial attempt at CMake support.
2010-03-24 21:17:13 +01:00
Joerg Bruehe
8b79e6209c
Add "--with-perfschema" to the configure options for RPMs.
2010-03-24 20:30:33 +01:00
Jonathan Perkin
779b967d75
Avoid newline in date output.
2010-03-24 20:17:41 +01:00
Joerg Bruehe
056e670542
Fix an issue with the IBM C++ compiler
...
which was detected during the build of 5.5.3-m3.
This requires version 9 of IBM C++ to help.
More fixes will still be needed, it is very strict
(or rather: a bit picky?) about templates.
2010-03-24 20:15:06 +01:00
Joerg Bruehe
81cbce56bb
Some fixes developed during the build of 5.5.3-m3
...
about handling the debug plugin files,
also "ha_example.*" are dropped.
2010-03-24 20:01:01 +01:00
Jonathan Perkin
528f384702
Try to add support for MYSQL_U_SCORE_VERSION and MYSQL_COPYRIGHT_YEAR.
2010-03-24 17:52:47 +01:00
Jonathan Perkin
b7795403ed
Fix mysql-test directory in RPMs.
...
While here:
- split INSTALL_*DIR variables into two sections, first set the major
variables, then second set the minor ones, using the major where
appropriate.
- format the settings for easier parsing (at least with a wide terminal)
2010-03-23 16:53:11 +01:00
Jonathan Perkin
f10be5b6ae
First cut at -DINSTALL_LAYOUT=DEB support.
2010-03-23 15:33:35 +01:00
Jonathan Perkin
912708c35b
Install libs directly into %{_libdir}
2010-03-23 13:56:28 +01:00
Jonathan Perkin
1f8c256c18
Try some more RPM fixes.
2010-03-23 12:28:13 +01:00
Jonathan Perkin
303ab1fc27
Fix RPM prefix.
2010-03-22 23:23:18 +01:00
Jonathan Perkin
38626df565
Set CPACK_PACKAGE_CONTACT, required for .deb
2010-03-22 23:15:28 +01:00
Jonathan Perkin
8a9b61cca4
Attempt to fix RPM support-files directory.
2010-03-22 18:33:20 +01:00
Joerg Bruehe
b61fe56bd7
Fixes related to bug#46587:
...
archive storage engine headers don't include my_global.h first
During the build of 5.5.3-m3 on older Linux platforms
(kernels 2.4 or early 2.6),
the symptom described in the bug report occurred both
in the "archive" and in the "innobase" storage engine.
This change is the patch proposed in that bug report,
and a similar one in innobase, that latter is aligned
with Vasil Dimov of Innobase, the original author.
2010-03-22 16:19:39 +01:00
Joerg Bruehe
d883671193
Some fixes for the build on Windows
...
as found necessary during the release build of 5.5.3-m3.
scripts/CMakeLists.txt:
The scripts "mysqldumpslow" and "mysqlhotcopy" need to be handled.
scripts/make_win_bin_dist:
1) We do not create ".map" files any more.
2) Typing error fixed, it isn't "$DISTDIR" but "$DESTDIR".
3) Security fix:
If the argument isn't of the form "dst=src",
then we want the variables to be empty.
The original code would have used an argument "foo"
to set both "$src" and "$dst" to this string,
which doesn't make much sense.
2010-03-22 16:02:31 +01:00
Jonathan Perkin
2968832978
Tidy.
2010-03-22 16:00:37 +01:00
