mariadb

Tree: 55de9b0468

Author	SHA1	Message	Date
unknown	55de9b0468	merge 10-base->10.0	12 years ago
unknown	3a75900b91	merge 5.5->10.0-base	12 years ago
Alexander Barkov	383de0fd1f	Merge 10.0-monty -> 10.0	12 years ago
unknown	dfed447888	merge 5.3->5.5	12 years ago
Alexey Botchkov	06a91b18d7	MDEV-4436 CHANGE COLUMN IF EXISTS does not work and throws wrong warning. Use sql_field->change parameter as the name of the field.	12 years ago
unknown	c98a054fde	MDEV-5153: Server crashes in Item_ref::fix_fields on 2nd execution of PS with LEFT JOIN and MERGE view or SELECT SQ 1. Transformation of row IN subquery made the same as single value. 2. replace_where_subcondition() made working on several layers of OR/AND because it called on expression before fix_fields().	12 years ago
unknown	c85db2c494	MDEV-5103: server crashed on singular Item_equal Singular Item_equal support added. The problem was that during constant table substitution Item_equal become containing only one constant which was not supported internally.	12 years ago
Alexey Botchkov	3cf7e283a6	MDEV-4435 Server crashes in my_strcasecmp_utf8 on ADD KEY IF NOT EXISTS with implicit name when the key exists. Use field name as a key name if the key name wasn't specified.	12 years ago
Alexander Barkov	f76beb080c	MDEV-5241: Collation incompatibilities with MySQL-5.6 A clean-up: removing the code catching collation incompatibilities from handler::check_collation_compatibility(), as the collation IDs are already replaced at this point by TABLE_SHARE::init_from_binary_frm_image.	12 years ago
Elena Stepanova	668a5a4ab8	MDEV-5272 MTR/mysqltest overlays for included files do not work on Windows	12 years ago
Elena Stepanova	1f13733b50	MDEV-5272 MTR/mysqltest overlays for included files do not work on Windows Modified according to the review comment	12 years ago
Sergei Golubchik	07d3fc5220	MDEV-201 - Assertion `!thd->spcont' failed in net_send_error on server shutdown restore sergii@pisem.net-20120327141644-xue6r05x1giswwsm that was lost in a merge	12 years ago
Sergei Golubchik	5ffa6904d2	MDEV-4880 Attempt to create a table without columns produces ER_ILLEGAL_HA instead of ER_TABLE_MUST_HAVE_COLUMNS	12 years ago
Sergei Golubchik	f3c63615d8	MDEV-4734 Adding ending / to a directory can fail when the directory ends with 0 +1 typo fixed	12 years ago
Sergei Golubchik	1c6394e503	MDEV-4931 Can't use SHUTDOWN in stored programs keywords that a statement could start from can only be in the 'keyword' list, never in the 'keyword_sp'	12 years ago
Sergei Golubchik	5e2b5510a4	MDEV-5260 discovery with sql is too restrictive allow ENGINE=FOOBAR in the discovering create table statement, as long as the discovering engine is FOOBAR too	12 years ago
Sergei Golubchik	09b63917be	MDEV-5238 Server crashes in find_role_grant_pair on SHOW GRANTS for an anonymous user	12 years ago
Elena Stepanova	700397a8e2	Fix for overlayed include files on Windows and a test case	12 years ago
Sergei Golubchik	ab2bf1ad0b	merge with 10.0.5	12 years ago
Sergei Golubchik	af22c45ec7	mariadb-tokudb-engine-10.0.deb	12 years ago
Michael Widenius	192678e7bf	MDEV-5241: Collation incompatibilities with MySQL-5.6 - Character set code & tests from Alexander Barkov - Integration with ALTER TABLE, REPAIR and open_table from Monty The problem was that MySQL 5.6 added some croatian and vitanamese character set collations that are incompatible with MariaDB. The fix is to move the MariaDB conflicting collation numbers out of the region that MySQL is likely to use. mysql_upgrade, REPAIR TABLE or ALTER TABLE will fix the collations. If one tries to access and old incompatible table, one will get the error "Table upgrade required...." After this patch, MariaDB supports all the MySQL character set collations and the old MariaDB croatian collations, which are closer to the latest standard than the MySQL versions. New character sets: ucs2_croatian_mysql561_uca_ci utf8_croatian_mysql561_uca_ci utf16_croatian_mysql561_uca_ci utf32_croatian_mysql561_uca_ci utf8mb4_croatian_mysql561_uca_ci Other things: - Fixed some compiler warnings - mysql_upgrade prints information about repaired tables. - Increased version number VERSION: Increased VERSION number client/mysqlcheck.c: Print repaired table name when using --verbose include/m_ctype.h: Add new MariaDB collation regions that are not likely to conflict with MySQL include/my_base.h: Added flag to detect if table was opened for ALTER TABLE mysql-test/r/ctype_ldml.result: Updated result mysql-test/r/ctype_uca.result: Updated result mysql-test/r/ctype_upgrade.result: Updated result mysql-test/r/ctype_utf16_uca.result: Updated result mysql-test/r/ctype_utf32_uca.result: Updated result mysql-test/r/ctype_utf8mb4_uca.result: Updated result mysql-test/std_data/ctype_upgrade: Test files for testing upgrading of conflicting collations mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result: New collations added mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result: New collations added mysql-test/suite/innodb/r/innodb_ctype_ldml.result: Updated test result mysql-test/suite/innodb/t/innodb_ctype_ldml.test: Updated test result mysql-test/suite/plugins/r/show_all_plugins.result: Updated version number mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result: Updated version number mysql-test/t/ctype_ldml.test: Updated test mysql-test/t/ctype_uca.test: Testing of new collations mysql-test/t/ctype_upgrade.test: Testing of upgrading tables with old collations The test ensures that: - We will get an error if we try to open a table with old collations. - CHECK TABLE will detect that the table needs to be upgraded. - ALTER TABLE and REPAIR will fix the table. - mysql_upgrade works as expected mysql-test/t/ctype_utf16_uca.test: Testing of new collations mysql-test/t/ctype_utf32_uca.test: Testing of new collations mysql-test/t/ctype_utf8mb4_uca.test: Testing of new collations mysys/charset-def.c: Added new character sets mysys/charset.c: Always give an error, if requested, if a character set didn't exist sql/handler.cc: - Added upgrade_collation() to check if collation is compatible with old version - check_collation_compatibility() checks if we are using an old collation from MariaDB 5.5 or MySQL 5.6 - ha_check_for_upgrade() returns HA_ADMIN_NEEDS_ALTER if we have an incompatible collation sql/handler.h: Added new prototypes sql/sql_table.cc: - Mark that tables are opened for ALTER TABLE - If table needs to be upgraded, ensure we are not using online alter table. sql/table.cc: - If we are using an old incompatible collation, change to use the new one and mark table as incompatible. - Give an error if we try to open an incompatible table. sql/table.h: Added error that table needs to be rebuild storage/connect/ha_connect.cc: Fixed compiler warning strings/ctype-uca.c: New character sets	12 years ago
Alexander Barkov	8f0be1ad7c	Merge 5.5 -> 10.0-base	12 years ago
Alexander Barkov	ef43b71fd2	Merge 5.3 -> 5.5	12 years ago
Alexander Barkov	542ce5a068	Merge 5.2 -> 5.3	12 years ago
Alexander Barkov	d5cd8cd724	Merge 5.1 -> 5.2	12 years ago
Alexander Barkov	a4dc526fc7	MDEV-5181 incorrect binary search in remove_status_vars() The loop in the binary search in remove_status_vars() was incorrectly implemented and could continue infinitely in some cases. Rewrote the binary search code.	12 years ago
Alexander Barkov	e02ad98c63	Merge 5.5 -> 10.0-base	12 years ago
unknown	7876d53b5f	MDEV-4506: Parallel replication. Delete any left-over deferred_event from rpl_group_info when deleting the parent object, to protect against memory leaks.	12 years ago
Alexander Barkov	4bf339453d	A patch from Kristian: Remove rpl_group_info from THD before freeing it, to avoid access-after-free in THD.	12 years ago
unknown	2ea0e59937	MDEV-4506: Parallel replication Tested manually that crash in the middle of writing transaction on the master does correctly cause a rollback on slave, so remove the corresponding ToDo.	12 years ago
Alexander Barkov	d79d0c4045	merge 5.3 -> 5.5	12 years ago
Alexander Barkov	a33bb00144	MDEV-4842 STR_TO_DATE does not work with UCS2/UTF16/UTF32	12 years ago
Sergei Golubchik	80112232d1	misc fixes for buildbot	12 years ago
Elena Stepanova	3959be70b2	10.0-specific changes to storage_engine tests	12 years ago
Elena Stepanova	ae62e19f27	Various changes coming from 5.6	12 years ago
Elena Stepanova	54b443b9aa	Some system tables have InnoDB engine	12 years ago
Elena Stepanova	317efa2a45	Semantics of ALTER ONLINE changed to mirror ALTER .. LOCK=NONE	12 years ago
Elena Stepanova	cb8889756a	Virtual columns are supported in InnoDB	12 years ago
Elena Stepanova	5920d03d3f	Fulltext search is supported in InnoDB	12 years ago
Elena Stepanova	aefded6302	Duplicate warnings were removed	12 years ago
Elena Stepanova	66ed34d6ed	More comprehensive error messages and codes	12 years ago
Elena Stepanova	949cb948de	InnoDB is built-in until XtraDB is merged	12 years ago
Sergei Golubchik	f0e06e31ff	10.0 version of MDEV-5254	12 years ago
unknown	e05962000d	MDEV-4506: Parallel replication Fix access of freed memory in debug builds. When deleting serial_rgi, safe_mutex was trying to access current_thd, when that thd had just been deleted (I hate all this current_thd and other magic thread local storage crap used all over the code). Now delete the serial_rgi before the thd.	12 years ago
unknown	273bcb92c1	Merge 10.0-base to 10.0	12 years ago
Elena Stepanova	e6c78988ed	Fixes for storage_engine test suite	12 years ago
Elena Stepanova	411761106e	More engine names are now obfuscated	12 years ago
Elena Stepanova	eddc1325cb	Undefined engine is not necessarily an error, removed the prefix	12 years ago
Elena Stepanova	71c56e6e45	.frm file is intact, so the absence of the error message seems to be correct	12 years ago
Elena Stepanova	cdecd86a53	More verbose error messages	12 years ago

1 2 3 4 5 ...

86629 Commits (55de9b0468c65b7277b7ca6978f4e01c01af1206) All Branches Search

86629 Commits (55de9b0468c65b7277b7ca6978f4e01c01af1206)

All Branches