1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-01 03:26:54 +03:00
Commit Graph

1144 Commits

Author SHA1 Message Date
4d8324d61a merge from trunk 2010-03-26 11:20:41 +01:00
5a9bad95a9 More exceptions for InnoDB plugin tests. 2010-03-24 23:09:23 +04:00
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
638a934a7d merge 51767 2010-03-16 10:50:45 +01:00
55cc86be5b merge from trunk 2010-03-16 10:48:41 +01:00
eb235387ae Bug #51767 Implement --start-and-exit also for MTR v2
Added option and logic, bypass safe_process
Adapted after review comments
2010-03-16 10:45:32 +01:00
3e32ba3ff1 Fix some compiler warnings seen in Buildbot.
Add some extra error output and code cleanup in an attempt to fix/debug
a rare random testsuite problem in check_warnings, where the exit code
from mysqltest is somehow corrupted inside mysql-test-run.pl.

include/my_global.h:
  Fix compiler warnings on some platforms.
mysql-test/lib/My/SafeProcess.pm:
  Move dereference of $? subprocess exit code closer to where it is generated,
  to make the code more robust and on the chance that this will fix the
  occasional problems in check_warnings we see in Buildbot.
mysql-test/mysql-test-run.pl:
  When check_warnings failed, also log the mysqld server for which it failed.
sql/sql_lex.cc:
  Fix compiler warning about possibly uninitialised value, by rewriting a for()
  loop that is always executed at least once into a do .. while() loop with an
  assert.
sql/table.cc:
  Fix compiler warning about uninitialised value.
storage/federatedx/ha_federatedx.cc:
  Fix uninitialised variable.
storage/maria/ma_delete.c:
  Fix compiler warning about uninitialised value.
storage/maria/ma_loghandler.c:
  Fix compiler warning about uninitialised value.
storage/myisam/ft_stopwords.c:
  Fix compiler warning.
storage/myisam/mi_write.c:
  Fix compiler warning about possibly uninitialised value, by rewriting a while()
  loop that is always executed at least once into a do .. while() loop with an
  assert.
storage/xtradb/btr/btr0cur.c:
  Fix compiler warning about possibly uninitialised value.
support-files/compiler_warnings.supp:
  Fix warning suppression to cover all cases in yassl.
vio/viossl.c:
  Fix compiler warning.
2010-03-10 11:32:14 +01:00
ca178b89e1 upmerge 45482 2010-03-09 16:17:36 +01:00
58bf6b6d59 merge 45482 2010-03-09 16:09:32 +01:00
22f923f2b1 Bug #51511 MTRv1 unable to find mysqld binary in out-of-source cmake builds
Set $glob_bindir, like $bindir in v2
Removed some obsolete IM code rather than changing it
2010-03-06 20:22:04 +01:00
27326d2c11 Bug #45482 MTR2: --default-storage-engine=csv is rejected by mtr
Added csv to list of builtin engines
Fixed dysfunctional part of csv.test so it actuallu used csv
2010-03-04 11:09:09 +01:00
4bf849c23c Merge MySQL 5.1.44 into MariaDB. 2010-03-04 09:03:07 +01:00
0b1d317b23 A follow-up on WL#5154 and WL#5182: remove forgotten options. 2010-03-03 22:22:02 +03:00
b87ed568b4 merge, CMake bugfixes, remove sp-error from experimental 2010-02-23 13:50:45 +01:00
c584f3d609 Bug#51393 : remove mtr_fix_privilege_tables from MTR v1 2010-02-22 19:39:36 +01:00
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
0fd18913d9 merge 2010-02-20 11:23:12 +01:00
fca241584f Auto-merge from mysql-next-mr. 2010-02-20 12:40:21 +03:00
b471134bfe merge 44054 2010-02-17 13:12:30 +01:00
dedad8ae44 merge 44054 2010-02-17 13:09:48 +01:00
5b7306e259 Bug #44054 MTR2: --no-reorder does not prevent reordering
Some logic would group by suite always
Disable this if using --noreorder
Also fix getting array from collect_one_suite() in this case
Amended according to previous comment
2010-02-17 12:37:37 +01:00
6e5a6259dd Bug #51248 Server start fails with MTR_VERSION=1 and code with WL5154
Replaced --default-character-set with --character-set-server
Replaced --language with --lc-messages-dir
NB full test suite not tested yet
2010-02-17 19:08:49 +01:00
5b77604cc2 merge 2010-02-16 23:19:47 +01:00
5f3e490174 new merge from next-mr 2010-02-16 18:23:21 +01:00
ac0d9be196 merge from 5.1-mtr 2010-02-22 14:52:11 +01:00
47bffd43f3 Fixed incomplete merge of 48878, embedded tests fail on Windows 2010-02-19 13:45:25 +01:00
3bd236fefb Add components to INSTALL, some eraly Wix support 2010-02-10 20:23:24 +01:00
7257047dce merge 2010-02-06 17:13:42 +01:00
a72f90bc43 Merge next-mr -> next-4284.
mysql-test/t/disabled.def:
  Restore disabled ssl tests: SSL certificates were updated.
  Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
  Disable parsing of the test case for Bug#47343, 
  the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
  Update results (CREATE TABLE IF NOT EXISTS takes
  into account existence of the temporary table).
2010-02-06 13:28:06 +03:00
f74c9dd04d Merge next-mr -> next-4284. 2010-02-03 17:10:36 +03:00
2b0f6b5ace Manual merge from mysql-trunk-merge.
Conflicts:
  - mysql-test/suite/rpl/r/rpl_binlog_grant.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - mysql-test/suite/rpl/t/rpl_binlog_grant.test
  - sql/sql_parse.cc
  - sql/sql_table.cc
  - sql/sql_test.cc
2010-01-31 01:06:50 +03:00
235e7b8f11 merge 49210 2010-01-28 15:19:18 +01:00
314fb8f62e upmerge 49210 2010-01-28 13:02:19 +01:00
480054c64d upmerge 49210 2010-01-28 13:01:01 +01:00
38e924b995 Bug #49210 Enable MTR timeout configuration through environment variables
Define env. vars for both timeout settings
Also incorporated 5.0 patch into mtr version 1
2010-01-27 16:32:59 +01:00
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
a1b7959a22 upmerge 43005,48888,49837,49878,50471 2010-01-20 16:43:14 +01:00
33fde0c025 upmerge 43005,48888,49837,49878,50471 2010-01-20 14:37:48 +01:00
2c9650f654 merge from next-mr 2010-01-19 13:35:23 +01:00
9ff20f55bd Bug#43005 main.init_connect fails on Windows due to wrong quoting of args
- The arguments are properly quoted when mtr.pl calls my_safe_process but
  unfortunately the all off when running with active state perl and stays
  in cygwin perl.
- Extend the patch to only quote args that are not already quoted
This a redo of previous commit, will be included in next push
2010-01-19 09:48:56 +01:00
d8ecbbe634 Merge with MySQL 5.1.42
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()

storage/xtradb/handler/ha_innodb.cc:
  Call explain_filename() to get proper names for partitioned tables
2010-01-15 17:27:55 +02:00
b84abb3c40 merge 2010-01-13 21:14:42 +01:00
2ac6690200 Follup fix for WL#4738 2010-01-06 16:21:43 +01:00
067e4b8f7e merge 48863,49269,49345,49672,49761 2010-01-06 10:01:11 +01:00
7ab9cbe3c3 merge 48863,49269,49345,49672,49761 2010-01-06 09:57:44 +01:00
ce019a2fac Bug #49345 re-introduce gprof to mysql-test-run.pl
Was available in v1
Porting to v2 required some rewriting
Updated after review comments
2010-01-05 21:35:50 +01:00
122e4436b1 Test skip due to missing OQGraph early, avoiding errors in log when starting server. 2010-01-04 13:23:17 +01:00
034e86a533 Merge from next-mr 2009-12-16 12:14:14 +01:00
d00c7a2d5f merge from trunk 2009-12-16 10:43:02 +01:00
d4676c22e0 Merge from 5.1 main 2009-12-16 10:37:41 +01:00