summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* merge: 5.1 -> 5.1-rplLuis Soares2009-01-081-4/+19
|\ | | | | | | | | conflicts: Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl
| * mysql-test/r/partition.resultBuild Team2008-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
| | | | | | | | since Oct 1st
| * Back merges from 6.0.8kent.boortz@sun.com2008-11-061-3/+18
| | | | | | | | | | | | | | | | | | | | | | - 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
* | MergeMagnus Svensson2008-10-081-0/+4
|\ \ | |/ |/|
| * WL#4189 Add smoke targetMagnus Svensson2008-10-081-0/+4
| |
* | merging mysql-5.1->mysql-5.1-seaNarayanan V2008-09-041-1/+2
|\ \ | |/
| * Fix path to myisamchk for mysql-5.1Jonathan Perkin2008-08-201-1/+1
| |
| * bug#33300: use myisamchk to verify that mysql_install_db hasJonathan Perkin2008-08-201-1/+2
| | | | | | | | created at least some files and that they are correct.
* | WL#4380Narayanan V2008-08-081-2/+2
| | | | | | | | 1) Disabled abi_check rule for all compilers except gcc 2) restored the -dI option to retain the header information.
* | WL#4380Narayanan V2008-08-061-8/+7
| | | | | | | | | | | | 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.
* | WL#4380Narayanan V2008-07-231-1/+1
| | | | | | | | fixed the abi_check rule to handle failure in the diff command on the solaris platform.
* | WL#4380Narayanan V2008-07-221-5/+12
| | | | | | | | | | | | | | | | | | | | | | 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.
* | WL#4380Narayanan V2008-07-211-1/+1
| | | | | | | | Modified the abi_check command to ignore space differences between the .pp and the .out files.
* | WL#4380Narayanan V2008-07-181-5/+8
| | | | | | | | | | | | 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
* | WL#4380Narayanan V2008-07-151-0/+2
| | | | | | Add the abi_check rule to the main build.
* | WL#4380Narayanan V2008-07-101-15/+25
| | | | | | | | Modified the abi_check target to check for only mysql.h and plugin.h for now.
* | WL#4380Thava Alagu2008-07-091-0/+57
|\ \ | |/ |/| Merging changes from 5.1 main tree to 5.1-sea team tree.
| * WL#4380Narayanan V2008-06-171-0/+57
| | | | | | | | | | | | | | | | | | 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.
* | Upmerge of fix forMatthias Leich mleich@mysql.com2008-06-031-2/+2
|\ \ | |/ |/| Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
| * Bug#36788 Multiple funcs_1 'trig' tests are failing on vanilla buildsMatthias Leich mleich@mysql.com2008-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge debian.(none):/MySQL/M50/indent-5.0joerg@debian.(none)2007-12-111-17/+17
| |\ | | | | | | | | | into debian.(none):/MySQL/M50/push-5.0
| | * Makefile.amjoerg@debian.(none)2007-12-101-17/+17
| | | | | | | | | | | | Formatting change to improve readability of the "test-*" targets.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2008-05-201-1/+6
|\ \ \ | | | | | | | | | | | | into bodhi.(none):/opt/local/work/mysql-5.1-27430
| * | | Bug#27430 Crash in subquery code when in PS and table DDL changed after PREPAREdavi@skynet.(none)2008-05-191-1/+6
| | | | | | | | | | | | | | | | | | | | Add test target to the makefile that will cause all statements to be re-prepared before execution.
* | | | Makefile.am:kent/mysqldev@mysql.com/production.mysql.com2008-04-081-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | mysql.spec.sh:kent/mysqldev@mysql.com/production.mysql.com2008-04-021-6/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | 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()
* | | Merge debian.(none):/MySQL/M51/indent-5.1joerg@debian.(none)2007-12-111-40/+40
|\ \ \ | | | | | | | | | | | | into debian.(none):/MySQL/M51/push-5.1
| * | | Merge debian.(none):/MySQL/M50/indent-5.0joerg@debian.(none)2007-12-111-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | into debian.(none):/MySQL/M51/indent-5.1 Manual merge of a formatting change.
* | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-12-101-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * | Bug #32219: too many hosts in default grant tables 6.0.3tsmith/mysqldev@mysql.com/production.mysql.com2007-11-301-1/+1
| |/ | | | | | | | | | | | | | | | | 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.
* | Makefile.amjoerg@trift2.2007-12-071-1/+1
| | | | | | | | Makefile syntax error, comment should precede the whole target.
* | Makefile.amjoerg@trift2.2007-12-071-1/+8
| | | | | | | | In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
* | use --builddir option for mysql_install_dbdf@pippilotta.erinye.com2007-11-281-1/+1
| |
* | Minor Makefile fixes:joerg@trift2.2007-10-301-6/+11
| | | | | | | | | | | | 1) Add a new top level "Makefile.am" target "make embedded-test". 2) Fix a syntax error (bad merge) in "netware/Makefile.am".
* | Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maintmtaylor@solace.(none)2007-10-121-2/+1
|\ \ | |/ | | | | into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
| * Removed debian dir. It was a mistake to embed it in the tree in the first ↵mtaylor@solace.(none)2007-10-121-2/+1
| | | | | | | | place.
* | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2007-09-271-1/+1
|\ \ | | | | | | | | | into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
| * | Makefile.am, configure.in:kent@mysql.com/kent-amd64.(none)2007-09-271-1/+1
| | | | | | | | | | | | | | | Handle pstack like other optional directories Check if a directory exists relative to $srcdir
* | | Merge trift-lap.fambruehe:/MySQL/M51/push-5.1joerg@trift-lap.fambruehe2007-09-271-2/+2
|\ \ \ | |/ / |/| | | | | into trift-lap.fambruehe:/MySQL/M51/antony-5.1
| * | Makefile.am:kent/mysqldev@mysql.com/production.mysql.com2007-09-011-2/+2
| | | | | | | | | | | | Traditional make wants line to start with TAB
* | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-09-261-3/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge debian.(none):/M50/rowlock-5.0joerg@debian.(none)2007-07-261-4/+1
|\ \ | |/ | | | | into debian.(none):/M51/rowlock-5.1
| * Remove the "row_lock" suite from the sources.joerg@debian.(none)2007-07-261-2/+1
| | | | | | | | For more information, see WL#3866 and the bugs numbered 28685 and 20390.
* | Additional tests checking for symptoms observed withinmleich@three.local.lan2007-07-131-3/+11
| | | | | | | | | | | | Bug28309 First insert violates unique constraint - was "memory" table empty ? --- Add missing phony targets
* | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2007-06-221-0/+8
|\ \ | |/ | | | | into trift2.:/MySQL/M51/push-5.1
| * Add the "nist" suite to the "test-bt" target,joerg@trift2.2007-06-221-0/+8
| | | | | | | | to be run only if it is available on the machine.
* | Makefile.am : Bypass bug#28685 and skip the "rowlock" suite in the release ↵joerg@trift2.2007-05-251-2/+4
| | | | | | | | builds.
* | Makefile.am : Add "embedded" tests to the "test-bt" target.joerg@trift2.2007-05-241-0/+5
| |
* | Merge trift2.:/MySQL/M50/bug26609-5.0joerg@trift2.2007-05-221-0/+2
|\ \ | |/ | | | | into trift2.:/MySQL/M51/bug26609-5.1
View Lorry Controller Status