Commit graph

117 commits

Author SHA1 Message Date
Jonathan Perkin
80fd4bef18 Apply wlad fixes from mysql-next-mr-bugfixing 2010-03-31 11:40:02 +02:00
Jonathan Perkin
e28ea740ad Back out remains of previous attempt. 2010-03-30 17:24:44 +02:00
Jonathan Perkin
98e33d14fa Fix from wlad. 2010-03-30 17:13:07 +02:00
Jonathan Perkin
2e160175c4 Try again.. 2010-03-30 13:37:17 +02:00
Jonathan Perkin
6740352b92 Try to fix the debug permissions stuff. 2010-03-30 12:32:38 +02:00
Jonathan Perkin
71785753b6 Install debug plugins, from wlad. 2010-03-26 17:28:06 +01:00
Jonathan Perkin
48f61d94f7 Expand INSTALL_INFODIR correctly.
Make mysql.info optional.
2010-03-25 15:04:39 +01:00
Jonathan Perkin
127bdb6eda 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
5fd878c3f0 Add INSTALL_INFODIR and use it to install mysql.info into the
correct location.
2010-03-25 11:43:11 +01:00
Jonathan Perkin
d5d30d435a Avoid newline in date output. 2010-03-24 20:17:41 +01:00
Jonathan Perkin
03bb7032e2 Try to add support for MYSQL_U_SCORE_VERSION and MYSQL_COPYRIGHT_YEAR. 2010-03-24 17:52:47 +01:00
Jonathan Perkin
aa917229b9 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
b960456150 First cut at -DINSTALL_LAYOUT=DEB support. 2010-03-23 15:33:35 +01:00
Jonathan Perkin
146a47ee12 Install libs directly into %{_libdir} 2010-03-23 13:56:28 +01:00
Jonathan Perkin
2dcbad90ba Try some more RPM fixes. 2010-03-23 12:28:13 +01:00
Jonathan Perkin
3fbdf9b838 Fix RPM prefix. 2010-03-22 23:23:18 +01:00
Jonathan Perkin
bb0d537524 Set CPACK_PACKAGE_CONTACT, required for .deb 2010-03-22 23:15:28 +01:00
Jonathan Perkin
c41240939b Attempt to fix RPM support-files directory. 2010-03-22 18:33:20 +01:00
Jonathan Perkin
31cc7f2eb0 Tidy. 2010-03-22 16:00:37 +01:00
Jonathan Perkin
486c06e29a Fix syntax. 2010-03-19 16:26:33 +01:00
Jonathan Perkin
9a8986637a First cut at SVR4 layout. 2010-03-19 15:34:42 +01:00
Jonathan Perkin
7e852519d7 Fixes from wlad 2010-03-18 21:06:12 +01:00
Vladislav Vaintroub
4c9f3504f8 Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P) 2010-03-08 00:31:06 +01:00
Vladislav Vaintroub
c903a13e6a merge 2010-03-03 15:48:54 +01:00
Vladislav Vaintroub
273d74eaa5 Bug #51488 :missing features and change behavior in cmake runs compared to
autotools runs
- Fix recognition of --with-debug=full in configure wrapper
- Remove CMakeCache.txt in configure wrapper, to match the original
- Fix recognition of max-no-ndb
- Fix broken dependencies of mysql_fix_privilege_table.sql from 
  mysql_system_tables.sql and mysql_system_tables_fix.sql
- Add "distclean target" that informs user about appropriate bzr command
2010-03-03 12:29:34 +01:00
Alexander Nozdrin
c962fdf25c Auto-merge from mysql-next-mr. 2010-02-25 22:58:57 +03:00
Vladislav Vaintroub
462500edfd Workaround crash with dtraced shared libraries under GCC 3.4.6 on 32 bit Solaris.
Crash happens in dlopen() code when trying to load the library. Crash does not happen when library is 
not DTrace instrumented . Additionally, crash does not happen with default Solaris 10 GCC 3.4.3 and
it does not happen if main executable is instrumented.

So , just check for this specific situation (32 bit, GCC3.4.6 , Solaris) and disable Dtrace in shared libraries.
We have only single plugin so far that is instrumented (ha_example)
2010-02-25 17:31:31 +01:00
Vladislav Vaintroub
342c5c2c7f On Solaris, overwrite CMake's proposed thread library -lthread with -lpthread.
-lthread works fine in most cases, but at least with gcc 3.4.6 on x86, dlopen() crashes when libpthread is not used. 
Note : the workaround existed prior and did not work  since CMAKE_THREADS_LIBS_INIT was already
 in cache.  Now, use SET(.. CACHE FORCE)  to overwrite the cached value.
2010-02-25 10:57:23 +01:00
Alexander Barkov
3acf917fee After-fix for WL#1213
Fixing cmake files.
2010-02-25 12:15:46 +04:00
Vladislav Vaintroub
2b75f0707b merge 2010-02-24 20:11:34 +01:00
Jonathan Perkin
26e77e0027 Some CMake packaging fixes:
- Remove INSTALL-BINARY from installed docs directory, we provide a copy
   in the root directory (but perhaps this should be revisited later).

 - Disable audit_null and daemon_example plugins.

 - Fix the docs directory.

 - Remove mysql-test/Makefile.in

 - Build and install mysql_tzinfo_to_sql

 - Remove share/charsets/languages.html
2010-02-24 19:19:24 +00:00
Vladislav Vaintroub
fea877877c #51466 : Source packages are broken with cmake in a cmake-agnostic environment
In the worst case possible scenario (no bzr, in-source build),
make dist produced a package that compiled ok with autotools
but failed to package because extra make_binary_distribution was
found in source package and was not built. make_binary_distribution
contained paths of the build machine.

Fix:  exclude some scripts that are produced in cmake build. 
Note that there is no good general fix for it in this specific scenario.
it is advisable to build source packages out of source or in bzr repo.
2010-02-24 20:07:05 +01:00
Vladislav Vaintroub
538ba33f5c Fix --with-ssl mappping (--with-ssl=dir should be "yes" or
actually "system"), --with-ssl should be "bundled".

Fixes error on sol-gcc-x86, where build machine had  openssl but not
the test box.
2010-02-24 19:51:45 +01:00
Vladislav Vaintroub
843ce43e19 remove whitespace at the end of line in Makefile.am, to keep BUILD/autorun.sh silent 2010-02-23 14:28:06 +01:00
Vladislav Vaintroub
c88200172e Bug #51414: Arguments with embedded spaces are not correctly handled by configure wrapper.
The bug was that ./configure was  passing paramers to subscripts as $@, and to handle embedded spaces it needs
to be quoted as "$@".
This resulting into a bug when ./configure was called e.g with CFLAGS='-m64 -Xstrconst'..

Additionally, fixed cmake/configure.pl did not handle environment variables passed on the command line.
this is fixed in this push
2010-02-23 12:32:57 +01:00
Vladislav Vaintroub
f4284ba6bd Fix BUILD/compile-pentium64-xxx scripts, when ccache is present.
Fix contains of :
-  splitting CC/CXX if there are more that 2 space-delimited tokens, add the rest to CFLAGS
(in this case CC was set to "ccache gcc --pipe", and this broke recognition of gcc compiler
as CMake understands CC consisting of 2 space delimited tokens but not more)

-  add my_new.cc to mysys fle list if C++ operator new is not found. Always, not only
for gcc  (the original problem was that missing operator new when compiling with CXX=gcc)
2010-02-22 20:55:27 +01:00
Vladislav Vaintroub
56700fd38c Install static client and embedded debug libraries 2010-02-20 20:40:03 +01:00
Vladislav Vaintroub
b2d289f3d7 extend configure-like perl wrapper for INSTALL_FOODIR variables 2010-02-20 14:17:55 +01:00
Vladislav Vaintroub
b7d7a42800 SET FN_NO_CASE_SENSE to 1 on Windows 2010-02-20 02:12:01 +01:00
Vladislav Vaintroub
b2eebd9966 fix typo 2010-02-17 00:27:45 +01:00
Vladislav Vaintroub
09dfcfa14b check for poll.h 2010-02-14 20:30:41 +01:00
Vladislav Vaintroub
befe4641f2 merge 2010-02-06 17:16:24 +01:00
Vladislav Vaintroub
be65bc9917 merge 2010-02-06 17:13:42 +01:00
Vladislav Vaintroub
88264b65b9 fix OSX package names is OSX_DEPLOYMENT_TARGET is specified 2010-02-05 07:39:11 +01:00
Vladislav Vaintroub
b6779a71c4 When using SIGNCODE parameter, check that signing of test executable reaööy works.
If not,  write warning and disable signing

Also, set SIGNCODE in mysql_release build configuration.
2010-02-02 21:32:38 +01:00
Vladislav Vaintroub
d025aac666 Define feature sets that correspond to different products (advanced, pro, enterprise etc) 2010-02-02 02:24:57 +01:00
Vladislav Vaintroub
66e1bc46da Do not run checks for strtok_r on Windows - we know the function is not there.. 2010-01-29 03:29:33 +01:00
vvaintroub
f719e51f8b Add windows system check cache that prevents tests from running, most are irrelevant anyway
Add cached variable WITH_XXX_STORAGE_ENGINE for dynamic plugins that can be static or 
dynamic.
2010-01-29 03:07:00 +01:00
Vladislav Vaintroub
3a8c2b5e95 do not redefine CPACK_PACKAGE_FILE_NAME, if it is already given 2010-01-28 11:30:21 +01:00
Vladislav Vaintroub
236a0a7945 prettification of package names and fix compile bug on OSX/ppc 2010-01-28 11:09:05 +01:00