Commit graph

1548 commits

Author SHA1 Message Date
Jonathan Perkin
11905f2f9d Merge danny's Windows fix from release branch 2010-05-11 11:11:00 +02:00
Kent Boortz
242600b7a7 On Mac OS X, add the "-arch" option to the 'mysql_config' output 2010-04-27 22:21:48 +02:00
Daniel Fischer
c62d8e5cb5 Make the libraries we produce on Windows actually usable 2010-04-16 10:27:18 +02:00
Jonathan Perkin
c7ed531ce6 Expand @HOSTNAME@. 2010-04-01 20:47:19 +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
910e84216d Try a bunch of fixes. 2010-03-31 23:52:49 +02: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
Joerg Bruehe
4aa12dd34c Fix for bug#51938,
extracted from a work-in-progress development branch
just for the build of 5.5.3-m3.
2010-03-15 19:13:37 +01:00
Mats Kindahl
ec82cbb293 Merging with mysql-next-mr-bugfixing 2010-03-10 10:41:19 +01:00
Marc Alff
ed3a57fea3 Bug#45194 mysql_upgrade deletes existing data in performance_schema database/schema
Before this fix, mysql_upgrade would always drop and re create
the performance_schema database.
This in theory could destroy user data created using 5.1 or older versions.

With this fix, mysql_upgrade checks the content of the
performance_schema database before droping it.
2010-03-05 08:31:01 -07: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
d3755291ca Manual merge from mysql-next-mr.
Conflicts:
  - sql/sql_base.cc
2010-03-02 17:34:50 +03:00
Mats Kindahl
5c8d6c7473 Bug #49022: Plugins included into bin release cannot be
installed on debug version of server

When starting a server using mysqld_safe with the option
--mysqld-version=debug, the debug version of the server
is started. When attempting to load a plugin that is not
debug-built, the load will fail because a non-debug built
plugin use, e.g., fastmutex while the debug-built server
uses safemutex.

To solve this problem, mysqld_safe will set the plugin-dir
to use a directory where debug-built plugins are placed.

This patch sets the plugin dir to <plugin-dir>/whatever,
when mysqld-version=whatever, and just <plugin-dir> otherwise.
2010-03-01 23:40:24 +01:00
Alexander Nozdrin
5867d275a3 Manual merge from mysql-trunk-merge.
Conflicts:
  - sql/share/Makefile.am
2010-03-01 12:39:44 +03:00
Alexey Botchkov
a8d2da2336 Bug#42465 mysqlhotcopy fails with "Table '<y>' was locked with a READ lock" error message.
Since 5.5 FLUSH TABLES requires unlocked tables so the old LOCK TABLES/FLUSH TABLES
    model fails. Use atomic FLUSH TABLES WITH READ LOCK instead.

per-file comments:
  scripts/mysqlhotcopy.sh
Bug#42465      mysqlhotcopy fails with "Table '<y>' was locked with a READ lock" error message.
     Use FLUSH TABLES WITH READ LOCK instead of LOCK TABLES / FLUSH TABLES pair.
     Keep the old scheme for older servers.
2010-02-28 23:49:29 +04:00
Alexey Kopytov
84766b060a Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
2010-02-26 16:06:31 +03:00
Vladislav Vaintroub
3fcd854852 Bug#51502: building with cmake creates an invalid mysqld_safe.
The problem was incorrect escaping used inside a strnig : in \"$MYSQLD\" was written as "\MYSQL\" 
(backslash and quote characters transposed), when defining FIND_PROC  variable for BSD or SysV
style "ps" command-

Additionally fixed obvious code duplication and random naming in CHECK_PID test.
2010-02-25 21:40:15 +01:00
Alexey Kopytov
f0d2fe34f2 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
2010-02-23 16:26:45 +03:00
Vladislav Vaintroub
b87ed568b4 merge, CMake bugfixes, remove sp-error from experimental 2010-02-23 13:50:45 +01:00
Alexander Nozdrin
0ceeeafe85 Manual merge from mysql-next-mr.
Conflicts:
  - mysql-test/r/mysqld--help-notwin.result
  - mysql-test/r/mysqld--help-win.result
2010-02-22 16:22:31 +03:00
Vladislav Vaintroub
0fd18913d9 merge 2010-02-20 11:23:12 +01:00
Alexander Nozdrin
fca241584f Auto-merge from mysql-next-mr. 2010-02-20 12:40:21 +03:00
Alexander Nozdrin
7e8611f82b Auto-merge from mysql-trunk-mtr. 2010-02-20 12:14:09 +03:00
Alexander Nozdrin
ce74e8ccd0 Auto-merge from mysql-5.1-mtr. 2010-02-20 12:09:17 +03:00
Vladislav Vaintroub
ea839618c4 Fix some glitches with INSTALL_LAYOUT=STANDALONE
- mysql_install_db is in scripts dir now
- sql-bench is installed
-some extra support-files (e.g ini) are in support-files
2010-02-19 18:30:08 +01:00
unknown
62db6839b8 configure.in
- Changes to the banner text
 - Use older AC_PROG_LIBTOOL (Bug#51009)

scripts/mysql_install_db.sh
 - Changes to banner text
2010-02-17 18:39:28 +01:00
Magne Mahre
7178879c80 WL#5154 Remove deprecated 4.1 features
A set of program options and variables was deprecated in
MySQL 5.1, and is hereby removed.



client/mysql.cc:
  --no-auto-rehash (-A)  is no longer deprecated
  --no-named-commands (-g) is now removed
  --skip-line-numbers (-L) is no longer deprecated
  --set-variable (-O) is now removed
  --no-pager is now removed
client/mysqlbinlog.cc:
  --position is now removed (use --start-position)
  -j is now equivalent with --start-position
client/mysqldump.c:
  --first-slave is now removed
  --no-set-names (-N) is now removed
  --set-variable (-O) is now removed
mysql-test/include/default_mysqld.cnf:
  default-character-set is removed as an option
  character-set-server is equivalent.
mysql-test/t/bug47671-master.opt:
  default-character-set option is removed
  character-set-server is equivalent
mysql-test/t/ctype_latin1_de-master.opt:
  default-character-set option is removed
  character-set-server is equivalent
mysql-test/t/ctype_ucs2_def-master.opt:
  default-collation is removed
  collation-server is equicalent
scripts/mysqld_multi.sh:
  --config-file has been superseded by
  --defaults-extra-file
sql/mysql_priv.h:
  Removed the version number in the deprecation
  warning text, as decided by ServerPT.
sql/mysqld.cc:
  --default-character-set (-C) is removed
  --default-collation is removed
  --log-long-format (-0) is removed
  --safe-show-database is removed
  --set-variable (-O) is removed
sql/sql_yacc.yy:
  The FRAC_SECOND keyword is removed
sql/sys_vars.cc:
  The sql_log_update system variable is removed
2010-02-17 10:18:17 +01:00
Georgi Kodinov
792fc9f784 Bug #35250: readline check breaks when doing vpath build
Fixed several (obvious) places that don't work with vpath
build.
2010-02-12 18:28:35 +02:00
Vladislav Vaintroub
a52ea360b3 - Optionally, copy mysqld renamed to mysqld-debug from debug build directory into resulting package
- Fix  to mysql_install_db.pl to the correct place on Windows ( under scripts directory)
2010-02-04 02:17:18 +01:00
Vladislav Vaintroub
c514d75ebb Handle different installation layouts.
using  cmake option INSTALL_LAYOUT=STANDALONE would produce the layout as in 
tar.gz or zip packages.
INSTALL_LAYOUT=UNIX will produce unixish install layout  (with mysqld being in sbin subdirectory , libs in lib/mysql etc). This layout is used for RPM packages.

Subtle differences in both packages unfortunately lead to the need to recompile MySQL to use with other package type - as otherwise for example default plugins or data directories would be wrong set.

There are numerous other variables that  allow fine-tuning packaging layout. (INSTALL_BINDIR, INSTALL_LIBDIR , INSTALL_PLUGINDIR etc).

This options are different from autotools as they do not expect full paths to directories, but only subdirectory of CMAKE_INSTALL_PREFIX.

There are 2 special options that expect full directory paths
- MYSQL_DATADIR that defines default MYSQL data directory (autotools equivalent
is --localstatedir)
- SYSCONFDIR  can be added to search my.cnf search path (autotools equivalent is --sysconfdir)
2010-01-24 16:23:16 +01:00
Alexey Kopytov
4a1b59b7ab Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-01-24 00:09:23 +03:00
Magne Mahre
132b46e96e WL#5154 Remove deprecated 4.1 features
Several items said to be deprecated in the 4.1 manual
have never been removed.  This worklog adds deprecation
warnings when these items are used, and warns the user 
that the items will be removed in MySQL 5.6.

A couple of previously deprecation decision have been
reversed (see single file comments)



client/client_priv.h:
  Macro similar to the one in the server (mysql_priv.h)
  for printing a deprecation warning message
client/mysql.cc:
  no-auto-rehash  will not be deprecated
  skip-line-numbers will not be deprecated
  skip-column-names will not be deprecated
  no-pager is deprecated
  set-variable is deprecated
  no-named-commands is deprecated
client/mysqladmin.cc:
  set-variable is deprecated
client/mysqlbinlog.cc:
  position is deprecated
client/mysqldump.c:
  first-slave is deprecated
  no-set-names is deprecated
  set-variable is deprecated
mysql-test/r/mysqlbinlog.result:
  Adding the [Warning] to the test case, just to show that the
  deprecation works.
  The test case will be changed in Celosia to use --start-position.
mysys/my_getopt.c:
  set-variable (include -O) is deprecated
scripts/mysqld_multi.sh:
  Warning for mysqld_multi
sql/mysqld.cc:
  default-collation is deprecated
  log-bin-trust-routine-creators is deprecated
  set-variable is deprecated
  default-character-set is deprecated
  safe-show-database is deprecated
sql/share/errmsg.txt:
  Added version number for sql_log_update deprecation message.
2010-01-21 09:10:05 +01:00
Vladislav Vaintroub
a87f4e1bbb Fix some problems found by kent.
-lm is sometimes not linked, which causes errors about undefined rint()
- FreeBSD embedded library does not link with the flags returned by mysql_config
 (added -lcrypt to LIBS, whereby causing overlinking in case of normal non-embedded client)
2010-01-18 21:19:24 +01:00
Vladislav Vaintroub
76630626a2 port some mysql_binary_distribution hacks to cmake 2010-01-15 01:21:43 +01:00
Vladislav Vaintroub
6b6f0ca461 merge 2010-01-14 16:07:27 +01:00
Vladislav Vaintroub
905f48b6f3 fix syntax error in INSTALL cmake command 2010-01-14 15:02:27 +01:00
Vladislav Vaintroub
4d49915cf2 Remove support for "make install" DESTDIR - did not work as expected 2010-01-14 14:54:32 +01:00
Vladislav Vaintroub
0c4446c617 Fix CFLAGS passed to mysql_config, in case makefile generator is Makefile based 2010-01-14 00:35:07 +00:00
Marc Alff
e0e0f9e3d4 WL#2360 Performance schema
Part V: performance schema implementation
2010-01-11 18:47:27 -07:00
Vladislav Vaintroub
4e84444e01 merge 2009-12-22 22:24:55 +01:00
Alexander Nozdrin
8ed868fa1e Manual merge from mysql-next-mr.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:32:58 +03:00
Alexander Nozdrin
f238adf75d Manual merge from mysql-trunk.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:31:24 +03:00
Vladislav Vaintroub
3de0482551 merge 2009-12-19 14:11:48 +01:00
Alexander Nozdrin
5f0c09dd72 Manual merge from mysql-trunk-merge.
Conflicts:
  - include/my_no_pthread.h
  - mysql-test/r/sp-ucs2.result
  - sql/log.cc
  - sql/sql_acl.cc
  - sql/sql_yacc.yy
2009-12-16 21:02:21 +03:00
Joerg Bruehe
9018db2c7a Automerge the changes of version 5.5.0-m2. 2009-12-16 16:20:08 +01:00
Vladislav Vaintroub
07bfd2617d merge 2009-12-16 15:34:11 +01:00
Joerg Bruehe
6ddab77da2 Automerge the build fixes of 5.5.0-m2 back into the tree. 2009-12-16 14:11:20 +01:00
Alexander Nozdrin
bcedf962ff Auto-merge from mysql-trunk. 2009-12-16 13:27:39 +03:00
Alexander Nozdrin
99890516ea Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00