summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-08-024-12/+510
|\
| * Merge branch '10.0' into 10.1Oleksandr Byelkin2018-07-313-15/+508
| |\
| | * MDEV-16851 On schema mismatch in IMPORT TABLESPACE, display ROW_FORMAT in ↵Marko Mäkelä2018-07-302-14/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear text This is motivated by Oracle MySQL Bug #27542720 SCHEMA MISMATCH - TABLE FLAGS DON'T MATCH, BUT FLAGS ARE NUMBERS but using a different approach. row_import::match_schema(): In case of a mismatch, display the ROW_FORMAT and optionally KEY_BLOCK_SIZE of the .cfg file.
* | | MDEV-16713 Hangs server with repeating log entryThirunarayanan Balathandayuthapani2018-07-252-0/+30
| | | | | | | | | | | | | | | | | | At most one transaction can be active at a time for temporary tables. There is no need to check previous version of record for the temporary tables.
* | | Implement a parameter for wait_all_purged.incMarko Mäkelä2018-07-051-1/+7
| | |
* | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-28/+0
|\ \ \ | |/ /
| * | MDEV-13103 Deal with page_compressed page corruptionMarko Mäkelä2018-06-144-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fil_page_decompress(): Replaces fil_decompress_page(). Allow the caller detect errors. Remove duplicated code. Use the "safe" instead of "fast" variants of decompression routines. fil_page_compress(): Replaces fil_compress_page(). The length of the input buffer always was srv_page_size (innodb_page_size). Remove printouts, and remove the fil_space_t* parameter. buf_tmp_buffer_t::reserved: Make private; the accessors acquire() and release() will use atomic memory access. buf_pool_reserve_tmp_slot(): Make static. Remove the second parameter. Do not acquire any mutex. Remove the allocation of the buffers. buf_tmp_reserve_crypt_buf(), buf_tmp_reserve_compression_buf(): Refactored away from buf_pool_reserve_tmp_slot(). buf_page_decrypt_after_read(): Make static, and simplify the logic. Use the encryption buffer also for decompressing. buf_page_io_complete(), buf_dblwr_process(): Check more failures. fil_space_encrypt(): Simplify the debug checks. fil_space_t::printed_compression_failure: Remove. fil_get_compression_alg_name(): Remove. fil_iterate(): Allocate a buffer for compression and decompression only once, instead of allocating and freeing it for every page that uses compression, during IMPORT TABLESPACE. fil_node_get_space_id(), fil_page_is_index_page(), fil_page_is_lzo_compressed(): Remove (unused code).
| * | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-132-2/+2
| |\ \ | | |/ | | | | | | Pull rename_table test-fix from 10.0
| | * Fix innodb.rename_table for embeddedVicențiu Ciorbaru2018-06-132-2/+2
| | | | | | | | | | | | | | | An embedded run will output the full path name instead of a relative one. Update results to cover both cases.
| * | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-28/+0
| |\ \
| | * \ Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-0717-14/+280
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-072-4/+6
| | |\ \ \
| | | * \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-248-36/+112
| | | |\ \ \
| | | * \ \ \ Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-197-2/+315
| | | |\ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-183-39/+41
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | | * \ \ \ \ \ Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52Nirbhay Choubey2016-09-192-4/+19
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-102-0/+202
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-234-118/+141
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-132-0/+71
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-109-17/+148
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-135-1/+87
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-0117-1561/+567
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/innobase/lock/lock0lock.cc storage/xtradb/lock/lock0lock.cc storage/xtradb/lock/lock0wait.cc support-files/mysql.server.sh
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-0343-1/+7438
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-0917-11/+697
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-3015-113/+590
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-202-20/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-1717-89/+458
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | * | | | | | | | | | | | | | | | | | | Galera MTR Tests: do not run innodb.innodb_stats_del_mark and some other ↵Sachin Setiya2017-03-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests with Galera, as it produces warnings Signed-off-by: Sachin Setiya <sachinsetia1001@gmail.com>
| | * | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-137-5/+68
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-285-3/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-247-10/+174
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-244-120/+262
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-296-0/+219
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-237-71/+292
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-1918-13/+395
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-3112-4/+187
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable tests previously disabled due to mysql-wsrep#114Philip Stoev2015-09-091-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Galera MTR tests: disable innodb.innodb_stats_* due to mysql-wsrep#114Philip Stoev2015-09-091-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.21Nirbhay Choubey2015-08-141-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix for some failing tests.mariadb-galera-5.5.45Nirbhay Choubey2015-08-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-5.5.45' into 5.5-galeraNirbhay Choubey2015-08-078-0/+355
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-217-25/+64
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-044-26/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-0814-3/+540
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-219-25/+142
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-0918-165/+983
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-03-102-0/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/innobase/dict/dict0dict.c storage/xtradb/dict/dict0dict.c
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-7672: Crash creating an InnoDB table with foreign keysmariadb-galera-5.5.42Jan Lindström2015-03-072-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analysis: after a red-black-tree lookup we use node withouth checking did lookup succeed or not. This lead to situation where NULL-pointer was used. Fix: Add additional check that found node from red-back-tree is valid.
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-187-7/+490
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge banch 5.5 till revision : fdd6c11 - MDEV-7419 Function cli_safe_read not exported Conflicts: .bzrignore debian/dist/Debian/mariadb-galera-server-5.5.files.in debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in storage/tokudb/CMakeLists.txt support-files/build-tags
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-228-3/+902
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bzr merge -r4393 lp:maria/5.5
View Lorry Controller Status