Commit graph

269 commits

Author SHA1 Message Date
Sven Sandberg
b0b0000d40 BUG#50410: rpl_ndb tests should run with binlog_format=row
Problem: The rpl_ndb did not set binlog_format explicitly. Since
the default is binlog_format=statement, it means that the suite
ran with that. ndb does not support binlog_format=statement,
and many tests were skipped because they sourced
include/have_binlog_format_row_or_mixed.inc
Fix: set binlog_format=row explicitly in the configuration file
for the rpl_ndb suite.
2010-05-12 12:29:02 +02:00
Georgi Kodinov
da3e734d64 removed a duplicate make target 2009-11-10 11:34:58 +02:00
Georgi Kodinov
04af81d7a2 merge 2009-10-30 16:57:16 +02:00
Hery Ramilison
c723b69ea2 Added make targets 'test-bt-fast' and 'test-bt-debug-fast'
Put variable declaration at the beginning of a block
2009-10-15 00:40:40 +02:00
Joerg Bruehe
67bcf54df6 Fix bug#46980
Option "--without-server" still not working in 5.1

The general approach is to make sure that source files
which require thread support are only compiled if the build
really needs thread support,
which means when the server is built or a thread-safe client
library.

This required several changes:
- Make sure the subdirectories "storage/" and "plugin/" are
  only processed if the server is built, not ifclient-only.
- Make the compilation of some modules which inherently
  require threading depend on thread supportin the build.
- Separate the handling of threading in "configure.in" from
  that of server issues, threading is also needed in a
  non-server build of a thread-safe client library.

Also, "libdbug" must get built even in a client-only build,
so "dbug/" must be in the list of client directories.

In addition, calls to thread functions in source files which
can be built without thread support must use the wrapper
functions which handle the non-threaded build.
So the modules "client/mysqlimport.c" and "client/mysqlslap.c"
must call "my_thread_end()" only via "mysql_thread_end()".
2009-09-17 18:34:24 +02:00
Luis Soares
9d8c117598 merge: 5.1 -> 5.1-rpl
conflicts:
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
2009-01-08 19:03:56 +00:00
Build Team
d2c4816716 mysql-test/r/partition.result
mysql-test/t/partition.test
sql/ha_partition.cc
  Bug#40954: Crash in MyISAM index code with concurrency test using partitioned tables
  Problem was usage of read_range_first with an empty key.
  Solution was to not to give a key if it was empty. (real author Mattias Jonsson)

storage/archive/archive_reader.c
client/mysqlslap.c
  Aligned the copyright texts output from "--version" of tools, to
  let internal tools be able to change them if needed.

storage/ndb/test/tools/connect.cpp
storage/ndb/test/run-test/atrt.hpp
  Corrected a few GPL headers not restricted to GPL version 2

Makefile.am
  Added missing --report-features to the 'test-bt-fast' target

support-files/mysql.spec.sh
  Reversed the removal of the "%define license GPL" in as internal
  tools depended on it
2008-11-25 03:04:58 +01:00
Build Team
366adeab08 Added "Sun Microsystems, Inc." to copyright headers on files modified
since Oct 1st
2008-11-10 21:21:49 +01:00
kent.boortz@sun.com
a21f8a0e57 Back merges from 6.0.8
- Removed some copy/paste between debug and normal build in RPM spec
- Removed "mysql_upgrade_shell" from RPM build
- Removed use of "grep -q" in "configure.in", not portable
- Improved test to disable ABI check not to accidently run for icc

Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
2008-11-06 19:38:19 +01:00
Magnus Svensson
2359d44c61 Merge 2008-10-08 22:30:56 +02:00
Magnus Svensson
846c8e03f8 WL#4189 Add smoke target 2008-10-08 22:29:15 +02:00
Narayanan V
9e8851b158 merging mysql-5.1->mysql-5.1-sea 2008-09-04 17:23:16 +05:30
Jonathan Perkin
e06daa8db4 Fix path to myisamchk for mysql-5.1 2008-08-20 14:06:22 +01:00
Jonathan Perkin
ded12789af bug#33300: use myisamchk to verify that mysql_install_db has
created at least some files and that they are correct.
2008-08-20 12:32:34 +01:00
Narayanan V
c5095f77f8 WL#4380
1) Disabled abi_check rule for all compilers except gcc
2) restored the -dI option to retain the header information.
2008-08-08 14:30:05 +05:30
Narayanan V
a9775e8507 WL#4380
1) Remove solaris sparc specific output produced by the
   pre-processor in the .out files
2) Ensure compatibility of preprocessor options for solaris/sparc
   platform.
2008-08-06 23:43:37 +05:30
Narayanan V
223c0177e7 WL#4380
fixed the abi_check rule to handle failure in the
diff command on the solaris platform.
2008-07-23 12:03:27 +05:30
Narayanan V
cadcb867bc WL#4380
1) When gcc -E is run in the Mac OS it introduces a line of 
   output that results in showing up as a difference between 
   the .pp and .out files. Removed this OS specific preprocessor 
   text inserted by the preprocessor in the MAC OS. Added a sed 
   regular expression to remove MAC OS specific pre-processor
   text.

2) Added the -w option to diff to remove the differences in
   output being caused in solaris.
2008-07-22 18:05:22 +05:30
Narayanan V
459480f81d WL#4380
Modified the abi_check command to ignore space
differences between the .pp and the .out files.
2008-07-21 16:09:08 +05:30
Narayanan V
bcbd5bc373 WL#4380
1) Modified abi_check rule to not write into the
   distribution directory.
2) Added the .pp files to EXTRA_DIST so that it will
   be included in the distribution
2008-07-18 19:21:54 +05:30
Narayanan V
4979d6b753 WL#4380
Add the abi_check rule to the main build.
2008-07-15 16:52:23 +05:30
Narayanan V
ccd18071a7 WL#4380
Modified the abi_check target to check for only
mysql.h and plugin.h for now.
2008-07-10 12:42:21 +05:30
Thava Alagu
39272e5538 WL#4380
Merging changes from 5.1 main tree to 5.1-sea team tree.
2008-07-09 19:04:22 +05:30
Narayanan V
2f472dff75 WL#4380
added a rule that use gcc to generate preprocessor output (gcc -E)
that can be then compared to a already generated output using 
the diff utility.

Ran make test on the repository to verify changes.
2008-06-17 17:57:04 +05:30
Matthias Leich mleich@mysql.com
6fec7fc19a Upmerge of fix for
Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
2008-06-03 12:21:48 +02:00
Matthias Leich mleich@mysql.com
be574a3a57 Bug#36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
Fix for this bug and additional improvements/fixes
In detail:
- Remove unicode attribute from several columns
  (unicode properties were nowhere needed/tested)
  of the table tb3
  -> The runnability of these tests depends no more on
     the availibility of some optional collations.
- Use a table tb3 with the same layout for all
  engines to be tested and unify the engine name
  within the protocols.
  -> <engine>_trig_<abc>.result have the same content
- Do not load data into tb3 if these rows have no
  impact on result sets
- Add tests for NDB (they exist already in 5.1)
- "--replace_result" at various places because
  NDB variants of tests failed with "random" row
  order in results
  This fixes a till now unknown weakness within the
  funcs_1 NDB tests existing in 5.1 and 6.0
- Fix the expected result of ndb_trig_1011ext
  which suffered from Bug 32656
  + disable this test
- funcs_1 could be executed with the mysql-test-run.pl
  option "--reorder", which saves some runtime by
  optimizing server restarts.
  Runtimes on tmpfs (one attempt only):
  with    reorder 132 seconds
  without reorder 183 seconds
- Adjust two "check" statements within func_misc.test
  which were incorrect (We had one run with result set
  difference though the server worked good.)
- minor fixes in comments
2008-06-02 21:57:11 +02:00
kostja@bodhi.(none)
2c0ce2a832 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-05-20 11:38:17 +04:00
davi@skynet.(none)
2f770c91d2 Bug#27430 Crash in subquery code when in PS and table DDL changed after PREPARE
Add test target to the makefile that will cause all
statements to be re-prepared before execution.
2008-05-19 13:39:31 -03:00
kent/mysqldev@mysql.com/production.mysql.com
9b6ac078f6 Makefile.am:
Add ChangeLog if it exists
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin
2008-04-08 11:44:18 +02:00
kent/mysqldev@mysql.com/production.mysql.com
c41a4e13f8 mysql.spec.sh:
If excluding Federated, make sure dynamic plugin is not built
Makefile.am:
  Only run cluster test when compiled with cluster
lib_sql.cc:
  Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
2008-04-02 22:24:53 +02:00
joerg@debian.(none)
eac07f4f4b Merge debian.(none):/MySQL/M51/indent-5.1
into  debian.(none):/MySQL/M51/push-5.1
2007-12-11 20:50:09 +01:00
joerg@debian.(none)
479ed82765 Merge debian.(none):/MySQL/M50/indent-5.0
into  debian.(none):/MySQL/M50/push-5.0
2007-12-11 20:47:31 +01:00
joerg@debian.(none)
c3d0a5c821 Merge debian.(none):/MySQL/M50/indent-5.0
into  debian.(none):/MySQL/M51/indent-5.1

Manual merge of a formatting change.
2007-12-11 20:32:38 +01:00
joerg@debian.(none)
d067b33783 Makefile.am
Formatting change to improve readability of the "test-*" targets.
2007-12-10 19:23:17 +01:00
df@pippilotta.erinye.com
42945c7726 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-12-10 12:16:41 +01:00
joerg@trift2.
151504a3d0 Makefile.am
Makefile syntax error, comment should precede the whole target.
2007-12-07 14:46:52 +01:00
joerg@trift2.
2cf168d6aa Makefile.am
In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
2007-12-07 11:54:59 +01:00
tsmith/mysqldev@mysql.com/production.mysql.com
da357f723a Bug #32219: too many hosts in default grant tables 6.0.3
Fix is to remove any references to the current hostname when running
mysql_install_db --cross-bootstrap.  (The dist-hook make target makes
this call, and the resulting data directory is included in the source
distribution as win/data/*.)

Also, a few other clean-ups to mysql_install_db while there.
2007-11-30 06:14:43 +01:00
df@pippilotta.erinye.com
5f21a18f48 use --builddir option for mysql_install_db 2007-11-28 17:36:28 +01:00
joerg@trift2.
37e47a080a Minor Makefile fixes:
1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".
2007-10-30 20:06:49 +01:00
mtaylor@solace.(none)
f31d2ab3c8 Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-10-12 02:18:13 -07:00
mtaylor@solace.(none)
709bb3948c Removed debian dir. It was a mistake to embed it in the tree in the first place. 2007-10-12 02:15:32 -07:00
kent@kent-amd64.(none)
ca8bb3d96f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
2007-09-27 21:40:07 +02:00
kent@mysql.com/kent-amd64.(none)
96b62a5c13 Makefile.am, configure.in:
Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
2007-09-27 21:39:23 +02:00
joerg@trift-lap.fambruehe
6aa39a1cf6 Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
into  trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-27 16:51:40 +02:00
kent@mysql.com/kent-amd64.(none)
1b53e4a547 Makefile.am:
Always include all sub directories in "make dist"
  Removed incorrect comment
configure.in:
  Unconditionally list make files in AC_CONFIG_FILES
  Removed 'thread_dirs', it is not used
  Minor cleanup
compile-dist:
  Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
  Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
  Removed DIST_SUBDIRS not needed
  Don't copy soft links as files into source package
2007-09-26 18:47:55 +02:00
kent/mysqldev@mysql.com/production.mysql.com
2e3b140e94 Makefile.am:
Traditional make wants line to start with TAB
2007-09-01 14:51:46 +02:00
joerg@debian.(none)
25f39c08bb Merge debian.(none):/M50/rowlock-5.0
into  debian.(none):/M51/rowlock-5.1
2007-07-26 18:40:46 +02:00
joerg@debian.(none)
1e455b4c28 Remove the "row_lock" suite from the sources.
For more information, see WL#3866 and the bugs numbered 28685 and 20390.
2007-07-26 17:25:03 +02:00
mleich@three.local.lan
f1a6ad4dde Additional tests checking for symptoms observed within
Bug28309 First insert violates unique constraint - was "memory" table empty ?
---
Add missing phony targets
2007-07-13 18:32:22 +02:00