summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-12-251-7/+3
|\
| * don't show --ssl* option if ssl is not compiled inSergei Golubchik2009-12-251-3/+3
| |
| * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables Bug#20415 Output of mysqld --help --verbose is incomplete Bug#25430 variable not found in SELECT @@global.ft_max_word_len; Bug#32902 plugin variables don't know their names Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting! Bug#34829 No default value for variable and setting default does not raise error Bug#34834 ? Is accepted as a valid sql mode Bug#34878 Few variables have default value according to documentation but error occurs Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var. Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status Bug#40988 log_output_basic.test succeeded though syntactically false. Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails) Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled Bug#44797 plugins w/o command-line options have no disabling option in --help Bug#46314 string system variables don't support expressions Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken Bug#46586 When using the plugin interface the type "set" for options caused a crash. Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds Bug#49417 some complaints about mysqld --help --verbose output Bug#49540 DEFAULT value of binlog_format isn't the default value Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix) Bug#49644 init_connect and \0 Bug#49645 init_slave and multi-byte characters Bug#49646 mysql --show-warnings crashes when server dies
* | mergeVladislav Vaintroub2009-12-161-4/+0
|\ \ | |/
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-4/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c
| | * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-3/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc
| | * \ Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-4/+0
| | |\ \
| | | * | removed a duplicate make targetGeorgi Kodinov2009-11-101-4/+0
| | | | |
* | | | | mergeVladislav Vaintroub2009-12-041-4/+5
|\ \ \ \ \ | |/ / / /
| * | | | WL#2360 Performance schemaMarc Alff2009-11-301-4/+5
| | |_|/ | |/| | | | | | | | | | Part 1: Instrumentation interface
* | | | automergeVladislav Vaintroub2009-11-131-0/+6
|\ \ \ \ | |/ / /
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-2/+2
| |\ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | mergeGeorgi Kodinov2009-10-301-0/+6
| | | |\ \
| | | | * | Added make targets 'test-bt-fast' and 'test-bt-debug-fast'Hery Ramilison2009-10-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Put variable declaration at the beginning of a block
| | * | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-2/+2
| | |\ \ \ \ | | | |/ / /
* | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-3/+6
| |_|_|_|/ |/| | | |
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Adding funcs_1 into "make test"Alexander Nozdrin2009-10-151-1/+2
| | | | |
* | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-2/+2
|/ / / / | | | | | | | | | | | | (mysql-next-mr backport)
* | | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-011-16/+18
|\ \ \ \ | |/ / /
| * | | 1. Respect experimental tag in gcov mode;Alexander Nozdrin2009-10-011-16/+18
| | | | | | | | | | | | 2. Mark ndb, rpl_ndb test suites experimental.
* | | | Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-281-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix bug#46980Joerg Bruehe2009-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()".
* | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb ↵Mikael Ronstrom2009-02-171-4/+23
|\ \ \ | |/ / | | | | | | 14.01.13 2009)
| * | 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
| | | |
* | | | A number of fixes to DTrace patchMikael Ronstrom2008-12-201-2/+2
|/ / / | | | | | | Removed instance manager from builds
* | | 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.