Commit graph

294 commits

Author SHA1 Message Date
Mats Kindahl
26d34c0324 Merging with mysql-trunk-bugfixing 2010-04-21 08:15:10 +02:00
Mats Kindahl
f96694f9c7 WL#5030: Splitting mysql_priv.h
Removing traces of mysql_priv.h from comments and other
non-source files that were missed before.
2010-04-21 00:29:30 +02:00
Vladislav Vaintroub
cb0d6611a3 Bug#51607: Automake distcheck target broken.
Reason for the error was that ./configure wrapper script was  not 
safe for VPATH builds used by "make distcheck", specifically it expected configure.am to be in the current directory.

Fix changes configure wrapper to resolve script names relative 
to configure script path.

Also, use $top_srcdir/configure.am instead of configure.am in dist-hook to be more VPATH friendly.
2010-03-09 22:51:36 +01:00
Vladislav Vaintroub
e8bdef8fcd merge 2009-12-25 16:49:21 +01:00
Sergei Golubchik
28056ba204 don't show --ssl* option if ssl is not compiled in 2009-12-25 22:36:59 +01:00
Sergei Golubchik
ae2768ce9c WL#4738 streamline/simplify @@variable creation process
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
2009-12-22 10:35:56 +01:00
Vladislav Vaintroub
2ff2d1873a merge 2009-12-16 15:34:11 +01:00
Alexander Nozdrin
bc2d4e620a Manual merge from mysql-trunk-merge.
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
2009-12-12 23:38:59 +03:00
Alexander Nozdrin
69cfd5c8ec Manual merge from mysql-trunk.
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
2009-12-11 12:39:38 +03:00
Vladislav Vaintroub
aea6035c73 merge 2009-12-04 20:05:04 +00:00
Marc Alff
fa3cfa07dd WL#2360 Performance schema
Part 1: Instrumentation interface
2009-11-30 17:49:15 -07:00
Alexey Kopytov
acf5330ab8 Manual merge from the mysql-5.1-bugteam. 2009-11-24 11:19:06 +03:00
Vladislav Vaintroub
2925dcd169 automerge 2009-11-13 13:26:16 +01:00
Alexander Nozdrin
dadf820743 Auto-merge from mysql-next-mr. 2009-11-10 10:31:33 +03:00
Vladislav Vaintroub
13cd7170cc WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00
Alexander Nozdrin
2ca5b2c791 Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
Alexander Nozdrin
411a6bfeb9 Auto-merge from mysql-next-mr. 2009-11-05 15:08:37 +03:00
Alexander Nozdrin
018358415f Auto-merge from mysql-5.1. 2009-11-05 12:36:34 +03:00
Sergei Golubchik
d101d144df WL#4903 Plugin Service API part I
(mysql-next-mr backport)
2009-11-02 21:05:42 +01:00
Georgi Kodinov
04af81d7a2 merge 2009-10-30 16:57:16 +02:00
Georgi Kodinov
da3e734d64 removed a duplicate make target 2009-11-10 11:34:58 +02:00
Alexander Nozdrin
eed8c7ab7d Adding funcs_1 into "make test" 2009-10-15 19:04:57 +04: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
Alexander Nozdrin
0f51423532 Merge from mysql-5.1. 2009-10-13 13:42:38 +04:00
Alexander Nozdrin
dbab87af6a Merge from mysql-trunk-bugfixing. 2009-10-01 15:32:45 +04:00
Alexander Nozdrin
83566cd4f1 1. Respect experimental tag in gcov mode;
2. Mark ndb, rpl_ndb test suites experimental.
2009-10-01 15:31:54 +04:00
Joerg Bruehe
650e68b7dc Merge 5.1-build up into 5.4-build ("trunk-build"). 2009-09-28 11:39:36 +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
Mikael Ronstrom
dd9119be20 Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01.13 2009) 2009-02-17 13:24:09 +01: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
Mikael Ronstrom
806cf36be0 A number of fixes to DTrace patch
Removed instance manager from builds
2008-12-20 15:16:46 +01: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