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
and fix a defect specific to 5.1 (wrong quoting).
support-files/mysql.spec.sh:
Merge the general flag handling (embedding in blanks) from 5.0 to 5.1,
add the 5.1 specific part (do not escape unquoted quote marks).
Still part of the fix for bug#40546.
Fix yesterday's patch so that it also works for the last flag.
Still part of the fix for bug#40546.
support-files/mysql.spec.sh:
The original "sed" command relied on a blank following the flag
which should be removed for debug builds.
This meant the last flag would not be matched.
Change it so that the whole string is enclosed in blanks,
demand leading and trailing blank for each flag,
and finally strip the leading + trailing blank.
- 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
Prevent this by modifying CFLAGS and CXXFLAGS.
Upmerge from 5.0, modified according to the different spec file structure.
support-files/mysql.spec.sh:
Bug #40546 Debug server in RPM is built with compiler optimization
Modify CFLAGS and CXXFLAGS for the duration of the debug server build
(implemented by doing it in a subshell)
so that they do not contain any optimization flag.
Play it safe and prepare for both gcc and icc.
Prevent this by modifying CFLAGS and CXXFLAGS.
support-files/mysql.spec.sh:
Bug #40546 Debug server in RPM is built with compiler optimization
Modify CFLAGS and CXXFLAGS for the duration of the debug server build
(implemented by doing it in a subshell)
so that they do not contain any optimization flag.
Play it safe and prepare for both gcc and icc.
Merge it up from 5.0 to 5.1,
adapt to some version differences.
configure.in:
Add an "automake condition" whether InnoDB is configured
so that we can evaluate it for the (non)generation of "innochecksum".
In 5.1, the test command must differ from 5.0.
Mostly, this affected files (programs, scripts, and manual pages)
which got built during a RPM build but were not listed in the
appropriate "%files" section of the "spec" file.
This is fixed now, they are added.
To make this consistent, this patch also makes the build of "innochecksum"
(and its inclusion in a tar.gz or other package) depend on whether InnoDB
is configured in the build.
Also, some tools to create Windows packages are irrelevant in any binary
Unix package (not the sources !), and so they are deleted before packaging.
configure.in:
To prevent "innochecksum" from getting built even if InnoDB is not configured
(and then being included in such packages),
we need an "automake condition" that evaluates whether we have InnoDB.
extra/Makefile.am:
Evaluate the new automake condition about having InnoDB,
and make the build of "innochecksum" depend on it.
man/Makefile.am:
Cleanup: There are manual files which we do not need,
like those about tools for Windows builds / packaging
(irrelevant in any Unix binary package)
and about NDB tools which do not get built.
scripts/make_binary_distribution.sh:
In any Unix binary package, do not include tools for Windows builds
(and their manual pages).
This does not affect source packages, of course.
support-files/mysql.spec.sh:
There were several files (binaries, scripts, and manuals)
which got built with a RPM but never packages,
add them to the respective RPM.
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
Docs/Makefile.am:
Add ChangeLog if it exists
Makefile.am:
- 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
support-files/mysql.spec.sh:
- No longer including the "Example" storage engine
- Added to configure "--without-ENGINE" if not to compile engine as plugin
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()
Makefile.am:
Only run cluster test when compiled with cluster
libmysqld/lib_sql.cc:
Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
support-files/mysql.spec.sh:
If excluding Federated, make sure dynamic plugin is not built
Check for an existing MySQL server package from a different vendor or
major MySQL version. In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.
support-files/mysql.spec.sh:
Add to the %pre server scriptlet checks to ensure that we're not
upgrading from another vendor's package, or that this is not a
major version upgrade. If an automatic upgrade isn't safe, print
basic instructions on how to do a manual upgrade, and bail out.
support-files/mysql.spec.sh:
Don't use the "test-bt" target to run the tests on the debug server,
rather use "test-bt-debug".
There are two reasons for this:
1) Consistency with the "tar.gz" builds.
2) The tool that evaluates the build logs needs unique "--comment=" options in the log,
or else it will fail when it generates the test status summary.
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
sql/Makefile.am:
SCCS merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm
include/config-win.h:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
ndb/src/ndbapi/DictCache.cpp:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
configure.in:
Manual merge, convert to default community-features off.
sql/set_var.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
support-files/mysql.spec.sh:
Manual merge.
Disable the community-server advertisement for Enterprise. Re-enable
this later.
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
VC++Files/sql/mysqld.vcproj:
Auto merged
include/config-win.h:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
Manual merge.
include/my_dbug.h:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/slave.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Makefile.am:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
Don't use explicit calls to mysql-test-run in spec
Makefile.am:
Don't use explicit calls to mysql-test-run in spec
support-files/mysql.spec.sh:
Don't use explicit calls to mysql-test-run in spec
into trift2.:/MySQL/M51/merge-5.1
include/config-win.h:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
sql/mysqld.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
Null-merge: 5.0 version number upgrade only, irrelevant for 5.1
into trift2.:/MySQL/M50/merge-5.0
include/config-win.h:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
sql/mysqld.cc:
Auto merged
support-files/mysql.spec.sh:
SCCS merged
into chilla.local:/home/mydev/mysql-5.1-axmrg
BUILD/SETUP.sh:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Manual merged
support-files/mysql.spec.sh:
Manual merged
