summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-101-0/+2
|\
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2017-11-091-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mysql-test/r/cte_recursive.result mysql-test/r/derived_cond_pushdown.result mysql-test/t/cte_recursive.test mysql-test/t/derived_cond_pushdown.test sql/datadict.cc sql/handler.cc
| | * Merge 10.1 into 10.2Marko Mäkelä2017-11-071-0/+2
| | |\
| | | * Merge 10.0 into 10.1Marko Mäkelä2017-11-061-0/+2
| | | |\
| | | | * MDEV-14029 Server does not remove #sql*.frm files after crash during ALTER TABLEElena Stepanova2017-11-051-0/+5
| | | | | | | | | | | | | | | | | | | | Add a check for #sql* files in test and mysql subdirs to the testcase check
* | | | | (Part#2) MDEV-13049 Querying INFORMATION_SCHEMA becomes slow in MariaDB 10.1Alexander Barkov2017-10-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a 10.3 specific part of MDEV-13049. It disables automatic sorting for "SELECT .. FROM INFORMATION_SCHEMA.{SCHEMATA|TABLES}" and adjusts the affected tests accordingly.
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-305-0/+691
|\ \ \ \ \ | |/ / / / | | | | | | | | | | TODO: enable MDEV-13049 optimization for 10.3
| * | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-304-0/+578
| |\ \ \ \ | | |/ / /
| | * | | MariaDB adjustments to innodb_gis tests.Jan Lindström2017-10-253-0/+495
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some test are still disabled as they provide different results, fail on different error or crash. Fixes also MDEV-14060 InnoDB: Foreign key constraint to geometry type does not work where test intentionally tried incorrect cases.
| | * | | MDEV-13626: Merge InnoDB test cases from MySQL 5.7Jan Lindström2017-10-251-0/+83
| | | | | | | | | | | | | | | | | | | | Add missing innodb_gis tests.
| * | | | MDEV-14013 : sql_mode=EMPTY_STRING_IS_NULLhalfspawn2017-10-141-0/+113
| | | | |
* | | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-10-051-18/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-10-041-18/+0
| |\ \ \ \ | | |/ / /
| | * | | cleanup: remove test include file, clarify the commentSergei Golubchik2017-10-041-18/+0
| | | | |
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-0/+147
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-12874 UPDATE statements with the same source and targethalfspawn2017-10-031-0/+147
| | | | |
* | | | | Compressed columns tests (replication and partition)Alice Sherepa2017-10-031-0/+260
| | | | |
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-182-0/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-172-0/+11
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2017-09-172-0/+11
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should also fix the MariaDB 10.2.2 bug MDEV-13826 CREATE FULLTEXT INDEX on encrypted table fails. MDEV-12634 FIXME: Modify innodb-index-online, innodb-table-online so that they will write and read merge sort files. InnoDB 5.7 introduced some optimizations to avoid using the files for small tables. Many collation test results have been adjusted for MDEV-10191.
| | | * | Write proper tests for MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytesMarko Mäkelä2017-09-162-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce innodb_encrypt_log.combinations and prove that the encryption and decryption take place during both online ADD INDEX (WL#5266) and online table-rebuilding ALTER (WL#6625).
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-071-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-071-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2017-09-071-1/+2
| | |\ \ \ | | | |/ /
| | | * | Merge 10.0 into 10.1Marko Mäkelä2017-09-071-1/+2
| | | |\ \ | | | | |/
| | | | * Make the SEARCH_ABORT logic actually workMarko Mäkelä2017-09-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The SEARCH_ABORT logic was not working as intended (tests were not being aborted).
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-017-0/+63
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-017-0/+63
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2017-08-315-0/+55
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For running the Galera tests, the variable my_disable_leak_check was set to true in order to avoid assertions due to memory leaks at shutdown. Some adjustments due to MDEV-13625 (merge InnoDB tests from MySQL 5.6) were performed. The most notable behaviour changes from 10.0 and 10.1 are the following: * innodb.innodb-table-online: adjustments for the DROP COLUMN behaviour change (MDEV-11114, MDEV-13613) * innodb.innodb-index-online-fk: the removal of a (1,NULL) record from the result; originally removed in MySQL 5.7 in the Oracle Bug #16244691 fix https://github.com/mysql/mysql-server/commit/377774689bf6a16af74182753fe950d514c2c6dd * innodb.create-index-debug: disabled due to MDEV-13680 (the MySQL Bug #77497 fix was not merged from 5.6 to 5.7.10) * innodb.innodb-alter-autoinc: MariaDB 10.2 behaves like MySQL 5.6/5.7, while MariaDB 10.0 and 10.1 assign different values when auto_increment_increment or auto_increment_offset are used. Also MySQL 5.6/5.7 exhibit different behaviour between LGORITHM=INPLACE and ALGORITHM=COPY, so something needs to be tested and fixed in both MariaDB 10.0 and 10.2. * innodb.innodb-wl5980-alter: disabled because it would trigger an InnoDB assertion failure (MDEV-13668 may need additional effort in 10.2)
| | | * | Merge branch '10.0' into 10.1Marko Mäkelä2017-08-304-2/+114
| | | |\ \ | | | | |/
| | | | * MDEV-13437 InnoDB fails to return error for XA COMMIT or XA ROLLBACK in ↵Andrei Elkin2017-08-294-2/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read-only mode Assertions failed due to incorrect handling of the --tc-heuristic-recover option when InnoDB is in read-only mode either due to innodb_read_only=1 or innodb_force_recovery>3. InnoDB failed to refuse a XA COMMIT or XA ROLLBACK operation, and there were errors in the error handling in the upper layer. This was fixed by making InnoDB XA operations respect the high_level_read_only flag. The InnoDB part of the fix and parts of the test main.tc_heuristic_recover were provided by Marko Mäkelä. LOCK_log mutex lock/unlock had to be added to fix MDEV-13438. The measure is confirmed by mysql sources as well. For testing of the conflicting option combination, mysql-test-run is made to export a new $MYSQLD_LAST_CMD. It holds the very last value generated by mtr.mysqld_start(). Even though the options have been also always stored in $mysqld->{'started_opts'} there were no access to them beyond the automatic server restart by mtr through the expect file interface. Effectively therefore $MYSQLD_LAST_CMD represents a more general interface to $mysqld->{'started_opts'} which can be used in wider scopes including server launch with incompatible options. Notice another existing method to restart the server with incompatible options relying on $MYSQLD_CMD is is aware of $mysqld->{'started_opts'} (the actual options that the server is launched by mtr). In order to use this method they would have to be provided manually. NOTE: When merging to 10.2, the file search_pattern_in_file++.inc should be replaced with the pre-existing search_pattern_in_file.inc.
| | | * | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1Jan Lindström2017-08-294-0/+26
| | | |\ \
| | | | * | Fix Merge ErrorSachin Setiya2017-08-231-1/+4
| | | | | |
| | | | * | Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-214-0/+23
| | | | |\ \
| | | | | * | MW-373 Wait for wsrep_ready at startup when provider is loadedTeemu Ollakka2017-08-143-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mysql-test/include/kill_and_restart_mysqld.inc
| | | | | * | Galera MTR Tests: MW-359 Include include/have_innodb.inc part of ↵Philip Stoev2017-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | include/galera_cluster.inc
| | | | | * | Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-095-0/+31
| | | | | |\ \ | | | | | | |/
| | | | | * | Fix mysqlhotcopy test failuresSachin Setiya2017-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | | | | * | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-1711-17/+301
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | | | | * | | Fix test casesSachin Setiya2017-03-161-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | | | | * | | Galera MTR tests: Make the mysqlhotcopy tests pass on Ubuntu 16.04Sachin Setiya2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachinsetia1001@gmail.com>
| | | | | * | | Galera MTR Tests: Test for GCF-942 - safe_to_bootstrap flag in grastate.datPhilip Stoev2017-03-121-0/+154
| | | | | | | |
| | | | | * | | MW-267: followup to the original pull request, removed unnecessary cast.Sachin Setiya2017-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachinsetia1001@gmail.com>
| | | | | * | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-133-0/+12
| | | | | |\ \ \
| | | | | * \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-282-6/+10
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-243-14/+2
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-294-5/+18
| | | | | |\ \ \ \ \ \
| | * | | | \ \ \ \ \ \ Merge 10.1 into 10.2Marko Mäkelä2017-08-292-0/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Combinations with innodb-undo-tablespaces to use in test filesElena Stepanova2017-08-282-0/+8
| | | |/ / / / / / / /
* | | | | | | | | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-08-264-48/+22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
View Lorry Controller Status