Commit graph

343 commits

Author SHA1 Message Date
Vladislav Vaintroub
21e943e0d1 Fix syntax error (missing space in SET command), that effectively prevents mysqld from being build with SSL. 2010-06-22 19:47:49 +02:00
Vladislav Vaintroub
3c74f80ab1 Fix ~1000 warnings class/struct mismatch.
Handle this warning in the future as error, this will prevent pushing to main trees.
2010-06-22 18:40:14 +02:00
Magne Mahre
7657ee10f8 Post-push fixups for WL#5349
mysql-test/suite/perfschema/t/no_threads-master.opt:
  Innodb will start multiple threads, which is
  not compatible with --one-thread.   Disable
  innodb to be able to run the test case.
2010-06-22 12:13:47 +02:00
Daniel Fischer
073943cd7d merge 2010-06-18 17:04:15 +02:00
Davi Arnaut
60153dd36e Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-06-08 20:44:25 -03:00
Joerg Bruehe
7758bdc8aa Get rid of the "net retry count" difference which
is not needed any more with current versions of FreeBSD.
(Entries 52410 and 52412 in the Bug DB)

That change is based on Dan Nelson replying on the
FreeBSD mailing list, freebsd-questions@freebsd.org
in a thread running from 2010-Apr-29 to 2010-May-1 titled
     "Need info about FreeBSD and interrupted system
      calls for MySQL code"

Also, ensure the cmake settings correspond to the autotools
ones: Add "HAVE_BROKEN_REALPATH" to cmake.


cmake/os/FreeBSD.cmake:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  However, it is still being kept as a comment for now,
  so that it can be re-activated should the need arise.
  
  In addition, set "HAVE_BROKEN_REALPATH" to completely
  mirror the autotools path.
configure.in:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  This definitely holds for FreeBSD version 6 and up.
  
  Adapt the informational messages to the path taken.
2010-05-27 19:02:19 +02:00
Daniel Fischer
458d0e7ae0 merge 2010-05-27 16:11:13 +02:00
Joerg Bruehe
9d83e2a79c Get rid ot the "net retry count" difference which
is not needed any more with current versions of FreeBSD.
(Entries 52410 and 52412 in the Bug DB)

That change is based on Dan Nelson replying on the
FreeBSD mailing list, freebsd-questions@freebsd.org
in a thread running from 2010-Apr-29 to 2010-May-1 titled
    "Need info about FreeBSD and interrupted system
     calls for MySQL code"

Also, ensure the cmake settings correspond to the autotools
ones: Add "HAVE_BROKEN_REALPATH" to cmake.

cmake/os/FreeBSD.cmake:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  However, it is still being kept for now, so that it can be
  re-activated should the need arise.
  
  In addition, set "HAVE_BROKEN_REALPATH" to completely
  mirrot the autotools path.
configure.in:
  With current versions of FreeBSD, threading is not done on
  the user-level any more, so the huge "net retry count"
  is not needed any more.
  However, it is still being kept for now, so that it can be
  re-activated should the need arise.
  
  Adapt the informational messages to the path taken.
2010-05-21 19:31:55 +02:00
Jon Olav Hauglid
198d51efe7 manual merge from mysql-trunk-bugfixing 2010-05-18 14:52:51 +02:00
Konstantin Osipov
d1dd2d11c4 Committing on behalf of Valdislav Vaintroub (reviewed and
approved):

3161 Vladislav Vaintroub       2010-04-29                 
 Bug#53196 : CMake builds don't support 'make tags' and 
'make ctags' targets.  
   - Added tags and ctags targets


CMakeLists.txt:
  Add tags and ctags targets.
cmake/Makefile.am:
  Add a cmake file to build tags.
cmake/tags.cmake:
  Build tags and ctags.
2010-05-14 18:42:10 +04:00
Jonathan Perkin
ce2aabb712 Changes to build using CMake according to existing release packages:
- Update/fix file layouts for each package type, add new types for
   native package formats including deb, rpm and svr4.

 - Build all plugins, including debug versions

 - Update compiler flags to match current release

 - Add missing @VAR@ expansions

 - Install correct mysqclient library symlinks

 - Fix icc/ia64 builds

 - Fix install of libmysqld-debug

 - Don't include mysql_embedded

 - Remove unpackaged manual pages to avoid missing files warnings

 - Don't install mtr's test suite
2010-05-12 12:51:23 +01:00
Jonathan Perkin
56a526c8a3 Explicitly set OSX flags, to match current release. 2010-05-07 12:11:09 +02:00
Jonathan Perkin
53acb1e58a Tidy install layout.
Remove 'ROOT' from sql-bench dir variable, it's unnecessary.
2010-05-06 15:20:14 +02:00
Jonathan Perkin
559c23fde2 Build all plugins.
Try to fix ia64/icc builds.
2010-05-05 13:49:03 +02:00
Daniel Fischer
fdf36464b3 apply wlad's patch to read the fill_help_tables.sql file whole, not line by line 2010-04-30 15:28:08 +02:00
Daniel Fischer
463a60ece6 merge 2010-04-30 13:36:57 +02:00
Jonathan Perkin
6f3e306683 Sync icc flags with reality. 2010-04-28 21:01:26 +02:00
Daniel Fischer
b83e1c8686 Merge 2010-04-21 14:58:09 +02:00
Mats Kindahl
c0817bacaf WL#5030: Splitting mysql_priv.h
Removing traces of mysql_priv.h from comments and other
non-source files that were missed before.
2010-04-21 00:29:30 +02:00
Jonathan Perkin
08b5cc6a4b Only use /usr/lib64 on x86_64, ia64 for example still uses /usr/lib 2010-04-19 20:21:04 +02:00
Jonathan Perkin
9b590649b8 Disable SSL with Intel CC 2010-04-16 15:05:58 +02:00
Jonathan Perkin
a03f41ee13 Fix SVR4 datadir 2010-04-01 14:56:25 +02:00
Jonathan Perkin
f3ebc19a33 Try to fix datadir 2010-04-01 13:35:16 +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
285d7ad2f8 Install debug plugins, from wlad. 2010-03-26 17:28:06 +01:00
Jonathan Perkin
42f3842ef8 Expand INSTALL_INFODIR correctly.
Make mysql.info optional.
2010-03-25 15:04:39 +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
779b967d75 Avoid newline in date output. 2010-03-24 20:17:41 +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
Jonathan Perkin
2968832978 Tidy. 2010-03-22 16:00:37 +01:00
Jonathan Perkin
7107d01282 Fix syntax. 2010-03-19 16:26:33 +01:00
Jonathan Perkin
423daa45ca First cut at SVR4 layout. 2010-03-19 15:34:42 +01:00
Jonathan Perkin
f56e58ea92 Fixes from wlad 2010-03-18 21:06:12 +01:00
Vladislav Vaintroub
c8e32a8331 Bug #52149 - packaging differences in CMake build
Corrected some packaging bugs:
- install mysqlservices library
- install libmysqlclient_r.so.{16,16.0.0} as links
  to libmysqlclient.so
- install libmysqld-debug.a
- install my_safe_process, my_safe_kill and
  symlinks to mysql-test-run.pl (mtr, mysql-test-run)
  into correct place ${INSTALL_MYSQLTESTDIR}


cmake/install_layout.cmake:
  Fix typo
cmake/install_macros.cmake:
  Refactor INSTALL_SYMLINK to allow arbitrary symlink paths.
  Old version of this macro would make link extension the same 
  as in target. This was not sufficient in some scenarios 
  (would not allow for example libmysqlclient_r.so.16=>./libmysqlclient.so 
  link)
libmysql/CMakeLists.txt:
  Install extra symlinks to libmysqlclient.so
  (libmysqlclient_r.so.16 and libmysqlclient_r.so.16.0.0)
  for backward compatiblity.
libmysqld/CMakeLists.txt:
  install libmysqld-debug.a
libservices/CMakeLists.txt:
  install mysqlservices library
mysql-test/lib/My/SafeProcess/CMakeLists.txt:
  install my_safe_process, my_safe_kill into  correct place
2010-03-17 19:56:22 +01:00
Vladislav Vaintroub
402cab754a Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P) 2010-03-08 00:31:06 +01:00
Vladislav Vaintroub
87a1ad6310 merge 2010-03-03 15:48:54 +01:00
Vladislav Vaintroub
cd03a4625f 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



cmake/configure.pl:
  - Recognize --with-debug=full, map to WITH_DEBUG_FULL
  - remove CMakeCache.txt, so the configuration is no more sticky
  (to match the original configure behavior)
cmake/plugin.cmake:
  - Recognize WITH_MAX_NO_NDB, this fixes missing storage engines after BUILD/*max-no-ndb scripts
mysql-test/CMakeLists.txt:
  test-force uses the same macros (MTR_FORCE) as test-bt* now
scripts/CMakeLists.txt:
  - Fix broken dependency when producing mysql_fix_privilege_tables.sql, reported by Davi.
  We now concatenate 2 scripts in custom command that
  has dependency on both scripts rather than concatenating them at cmake time.
sql/CMakeLists.txt:
  Address frequently asked question "where is distclean" by implementing distclean target 
  that does nothing except pointing to appropriate 
  bzr command.
  
  It is better not to call "bzr clean-tree" automatically, without user consent.
  It could clean new files that were meant to be added.
2010-03-03 12:29:34 +01:00
Alexander Nozdrin
accce6be6e Auto-merge from mysql-next-mr. 2010-02-25 22:58:57 +03:00