Merged lp:maria/maria-10.0-galera up to revision 3879.
Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
The autotools-based build system has been superseded and
is being removed in order to ease the maintenance burden on
developers tweaking and maintaining the build system.
In order to support tools that need to extract the server
version, a new file that (only) contains the server version,
called VERSION, is introduced. The file contents are human
and machine-readable. The format is:
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=8
MYSQL_VERSION_EXTRA=-rc
The CMake based version extraction in cmake/mysql_version.cmake
is changed to extract the version from this file. The configure
to CMake wrapper is retained for backwards compatibility and to
support the BUILD/ scripts. Also, a new a makefile target
show-dist-name that prints the server version is introduced.
VERSION:
Add top-level version file.
cmake/mysql_version.cmake:
Get version information from the top-level VERSION file.
Do not cache the version components (MAJOR_VERSION, etc).
Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
- Changed to still use bcmp() in certain cases becasue
- Faster for short unaligneed strings than memcmp()
- Bettern when using valgrind
- Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems
- Changed code to use MariaDB version of select->skip_record()
- Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
(make relies GNU extentions). The patch was partially
backport from 6.0.
Original comment:
bug#30708: make relies GNU extensions. Now that we no longer use
BitKeeper we can safely remove the SCCS handling with no loss of
functionality.
Docs/sp-imp-spec.txt:
New sql_mode added.
include/my_base.h:
Flag in frm of create options.
libmysqld/CMakeLists.txt:
New files added.
libmysqld/Makefile.am:
New files added.
mysql-test/r/events_bugs.result:
New sql_mode added.
mysql-test/r/information_schema.result:
New sql_mode added.
mysql-test/r/sp.result:
New sql_mode added.
mysql-test/r/system_mysql_db.result:
New sql_mode added.
mysql-test/suite/funcs_1/r/is_columns_mysql.result:
New sql_mode added.
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
New sql_mode added.
mysql-test/t/events_bugs.test:
New sql_mode added.
mysql-test/t/sp.test:
New sql_mode added.
scripts/mysql_system_tables.sql:
New sql_mode added.
scripts/mysql_system_tables_fix.sql:
New sql_mode added.
sql/CMakeLists.txt:
New files added.
sql/Makefile.am:
New files added.
sql/event_db_repository.cc:
New sql_mode added.
sql/field.cc:
Create options support added.
sql/field.h:
Create options support added.
sql/ha_partition.cc:
Create options support added.
sql/handler.cc:
Create options support added.
sql/handler.h:
Create options support added.
sql/log_event.h:
New sql_mode added.
sql/mysql_priv.h:
New sql_mode added.
sql/mysqld.cc:
New sql_mode added.
sql/share/errmsg.txt:
New error messages added.
sql/sp.cc:
New sql_mode added.
sql/sp_head.cc:
Create options support added.
sql/sql_class.cc:
Create options support added.
Debug added.
sql/sql_class.h:
Create options support added.
sql/sql_insert.cc:
my_safe_a* moved to mysqld_priv.h
sql/sql_lex.h:
Create options support added.
sql/sql_parse.cc:
Create options support added.
sql/sql_show.cc:
Create options support added.
sql/sql_table.cc:
Create options support added.
sql/sql_view.cc:
New sql_mode added.
sql/sql_yacc.yy:
Create options support added.
sql/structs.h:
Create options support added.
sql/table.cc:
Create options support added.
sql/table.h:
Create options support added.
sql/unireg.cc:
Create options support added.
storage/example/ha_example.cc:
Create options example.
storage/example/ha_example.h:
Create options example.
storage/pbxt/src/discover_xt.cc:
Create options support added.
- mysql_install_db doesn't require --basedir option anymore
- Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install
- Move some files from share/mysql to where they have always been (1.0 - 5.0)
- Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility)
- Move man files to 'man' (from 'share/man')
- Ensure that all scripts are executable
mysql_secure_installation.sh
- Added support for --basedir flag
- Don't assume that the mysql binary is in the path
Other:
- Fixed crash when one got kill signal during bootstrap
Docs/INSTALL-BINARY:
Change references from MySQL to MariaDB
Docs/mysql.info:
Change references from MySQL to MariaDB
README:
Removed duplicate row
configure.in:
Change references from MySQL to MariaDB
libmysql/libmysql.c:
Assume that if version string contains '-maria-' we are also using MariaDB
scripts/make_binary_distribution.sh:
Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install
Remove some files that should not be part of a MariaDB binary install
Move some files from share/mysql to where they have always been (1.0 - 5.0)
Move man files to 'man' (from 'share/man')
Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility)
Removed generation of 'netware/init_db.sql', as it was never used
Remove old reference to bk tree
scripts/mysql_secure_installation.sh:
Added support for --basedir flag
Don't assume that the mysql binary is in the path
Use .my.cnf files
Removed a lot of useless 'echo' rows
sql/mysqld.cc:
Fixed crash when one got kill signal during bootstrap
storage/maria/Makefile.am:
Don't add internal test files to binary distributions
storage/myisam/Makefile.am:
Don't add internal test files to binary distributions
support-files/Makefile.am:
Make scripts executable
support-files/config.huge.ini.sh:
Removed execution bit
support-files/config.medium.ini.sh:
Removed execution bit
support-files/config.small.ini.sh:
Removed execution bit
support-files/mysql.server.sh:
Ensure this works also mysqld is in the 'bin' directory
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
Updated links to version 5.1 of the manual
Docs/INSTALL-BINARY:
Updated links to version 5.1 of the manual
INSTALL-SOURCE:
Updated links to version 5.1 of the manual
INSTALL-WIN-SOURCE:
Updated links to version 5.1 of the manual
support-files/MacOSX/ReadMe.txt:
Updated links to version 5.1 of the manual
Include "manual.chm" in source TAR if it exists
configure.in:
Include "manual.chm" in source TAR if it exists
Docs/Makefile.am:
Include "manual.chm" in source TAR if it exists
Removed place holder for 'manual.chm'
.del-manual.chm:
Delete: Docs/manual.chm
BitKeeper/deleted/.del-manual.chm:
Delete: Docs/manual.chm
Docs/Makefile.am:
Removed place holder for 'manual.chm'
Added manual.chm to EXTRA_DIST
Removed install of INSTALL-BINARY, handled
by install scripts.
ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
Updated links to version 5.0 of the manual
Docs/INSTALL-BINARY:
Updated links to version 5.0 of the manual
INSTALL-SOURCE:
Updated links to version 5.0 of the manual
INSTALL-WIN-SOURCE:
Updated links to version 5.0 of the manual
support-files/MacOSX/ReadMe.txt:
Updated links to version 5.0 of the manual
Docs/Makefile.am:
Added manual.chm to EXTRA_DIST
Removed install of INSTALL-BINARY, handled
by install scripts.
Let place holders for real documentation have text that
makes sense to the user (Bug#25205)
BitKeeper/deleted/.del-generate-text-files.pl:
Delete: Docs/Support/generate-text-files.pl
Docs/INSTALL-BINARY:
BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY
INSTALL-SOURCE:
BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE
support-files/MacOSX/ReadMe.txt:
BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt
Docs/mysql.info:
More of a end-user text
Docs/Makefile.am:
Don't generate text files from the documentation
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/deleted/.del-fill_func_tables.sh:
Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
BitKeeper/deleted/.del-fill_func_tables.sh:
Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
Auto merged
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
Auto merged
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
Auto merged
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
Auto merged
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
Auto merged
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
Auto merged
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
Auto merged
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
Auto merged
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
Auto merged
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
Auto merged
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
Auto merged
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
Auto merged
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
Auto merged
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
Auto merged
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
Auto merged
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
Auto merged
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
Auto merged
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
Auto merged
BitKeeper/deleted/.del-.cvsignore~250f630140b90042:
Auto merged
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt~6e5b88fe4217504d:
Auto merged
BitKeeper/deleted/.del-algor.gif~72c40c3bad198f2f:
Auto merged
BitKeeper/deleted/.del-algor.txt~37d2b5c1290e3cfa:
Auto merged
BitKeeper/deleted/.del-bk.txt~ffd510fa9531f87c:
Auto merged
BitKeeper/deleted/.del-dubois.gif~e02d361b13b1c4a4:
Auto merged
BitKeeper/deleted/.del-dubois.txt~998581cf9040fcc:
Auto merged
BitKeeper/deleted/.del-ecomm.gif~f9bce6949b171613:
Auto merged
BitKeeper/deleted/.del-ecomm.txt~27494674104ee9db:
Auto merged
BitKeeper/deleted/.del-in_21.gif~4a0b14f6d76458a9:
Auto merged
BitKeeper/deleted/.del-in_21.txt~448fb4b3d8c0b34e:
Auto merged
BitKeeper/deleted/.del-manual.gif~657cf08119b1b3fc:
Auto merged
BitKeeper/deleted/.del-manual.txt~4702af61ea5e3c29:
Auto merged
BitKeeper/deleted/.del-msql.gif~72ea7c6d307b9108:
Auto merged
BitKeeper/deleted/.del-msql.txt~235ae568824f4073:
Auto merged
BitKeeper/deleted/.del-mysql-01.gif~6f3f2e474b834ac6:
Auto merged
BitKeeper/deleted/.del-mysql-02.gif~5e03e2ffa6bd060f:
Auto merged
BitKeeper/deleted/.del-mysql-03.gif~a510e3599346cd5f:
Auto merged
BitKeeper/deleted/.del-mysql-04.gif~6c3fdc91da64574:
Auto merged
BitKeeper/deleted/.del-mysql-05.gif~230c28315136655:
Auto merged
BitKeeper/deleted/.del-mysql-06.gif~8bb16461fd45634e:
Auto merged
BitKeeper/deleted/.del-dbi.gif~8f6861147437298b:
Auto merged
BitKeeper/deleted/.del-dbi.txt~f5cf3fe321168fd5:
Auto merged
BitKeeper/deleted/.del-mysql-07.gif~b86f918998a2114e:
Auto merged
BitKeeper/deleted/.del-mysql-08.gif~50fb4d886f82e8bc:
Auto merged
BitKeeper/deleted/.del-mysql-09.gif~17604ce9d92cd94a:
Auto merged
BitKeeper/deleted/.del-mysql-10.gif~a8b5306c4d911f8e:
Auto merged
BitKeeper/deleted/.del-mysql-11.gif~8495404458978524:
Auto merged
BitKeeper/deleted/.del-mysql-12.gif~18d47c1ad5aef481:
Auto merged
BitKeeper/deleted/.del-mysql-13.gif~1ad2eedf58da3aaa:
Auto merged
BitKeeper/deleted/.del-mysql-14.gif~a11e7df8653ad1b1:
Auto merged
BitKeeper/deleted/.del-mysql-15.gif~64c998fdd6fc1ae1:
Auto merged
BitKeeper/deleted/.del-mysql-16.gif~6a6c86de2f85f0f5:
Auto merged
BitKeeper/deleted/.del-mysql-17.gif~b07962578d0952b1:
Auto merged
BitKeeper/deleted/.del-mysql-compatible.jpg~56ecc684688a7382:
Auto merged
BitKeeper/deleted/.del-mysql_anim-01.gif~d27d4f0c1a2a6da9:
Auto merged
BitKeeper/deleted/.del-mysql_anim-02.gif~476224d724007343:
Auto merged
BitKeeper/deleted/.del-mysql_anim-03.gif~470dd9c9a8bd55fc:
Auto merged
BitKeeper/deleted/.del-mysql_anim-04.gif~14f429c87c0c718:
Auto merged
BitKeeper/deleted/.del-mysql_anim-05.gif~e63e7f003b77ad95:
Auto merged
BitKeeper/deleted/.del-mysql_anim-06.gif~d9cffaf35d9d4719:
Auto merged
BitKeeper/deleted/.del-prof.gif~2fa8ed201d9d05fe:
Auto merged
BitKeeper/deleted/.del-prof.txt~9fc04ec3e5ce8361:
Auto merged
BitKeeper/deleted/.del-pthreads.gif~2d9460dec2577859:
Auto merged
BitKeeper/deleted/.del-pthreads.txt~fc9e17d021335a39:
Auto merged
BitKeeper/deleted/.del-realmen.gif~86113e3b1fcbd597:
Auto merged
BitKeeper/deleted/.del-realmen.txt~81c30565a8f06539:
Auto merged
BitKeeper/deleted/.del-sql-99.gif~df369376884a5689:
Auto merged
BitKeeper/deleted/.del-sql-99.txt~eff316adac3dd5b8:
Auto merged
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch~40d336454ecf98db:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
BitKeeper/deleted/.del-colspec-fix.pl:
Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl:
Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl:
Auto merged
BitKeeper/deleted/.del-docbook-split:
Auto merged
BitKeeper/deleted/.del-make-docbook:
Auto merged
BitKeeper/deleted/.del-make-makefile:
Auto merged
BitKeeper/deleted/.del-test-make-manual-de:
Auto merged
BitKeeper/deleted/.del-test-make-manual:
Auto merged
BitKeeper/deleted/.del-xwf:
Auto merged
