summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/r
Commit message (Collapse)AuthorAgeFilesLines
* Created suites for heap, archive and csv.Michael Widenius2012-04-0434-14280/+0
| | | | | | | | Moved test from main suite to the new suites. Move tests from maria/t and maria/r to maria mysql-test/mysql-test-run.pl: Added support for the new suites
* Merge of compatibility fixesMichael Widenius2012-04-021-2/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing tests in sys_vars as we have now stricter checking of setting of variables. mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test: One can now only assign 0 or 1 to boolean variables mysys/my_getsystime.c: Merge + fixed bug that __NR_clock_gettime didn't work in 5.5
| * Merge from 5.2Michael Widenius2012-03-301-0/+17
| |\
| | * Automatic mergeMichael Widenius2012-03-301-0/+17
| | |\
| | | * Fixed bug lp:967914 "CHECK TABLE persistently reports table corruption after ↵Michael Widenius2012-03-301-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing Aria logs" Fixed that repair removes the 'table is moved' mark. mysql-test/suite/maria/r/maria-autozerofill.result: Test case for lp:967914 mysql-test/suite/maria/t/maria-autozerofill.test: Test case for lp:967914 storage/maria/ha_maria.cc: Fixed that repair removes the 'table is moved' mark.
| * | | Automatic mergeMichael Widenius2012-03-281-2/+27
| |\ \ \ | | |/ /
| | * | Merge with 5.1Michael Widenius2012-03-281-2/+27
| | |\ \ | | | |/
| | | * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-281-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was that check/optimize/anaylze did not zerofill the table before they started to work on it. Added one more element to not often used function handler::auto_repair() to allow handler to decide when to auto repair. mysql-test/suite/maria/r/maria-autozerofill.result: Test case for lp:944422 mysql-test/suite/maria/t/maria-autozerofill.test: Test case for lp:944422 sql/ha_partition.cc: Added argument to auto_repair() sql/ha_partition.h: Added argument to auto_repair() sql/handler.h: Added argument to auto_repair() sql/table.cc: Let auto_repair() decide which errors to trigger auto-repair storage/archive/ha_archive.h: Added argument to auto_repair() storage/csv/ha_tina.h: Added argument to auto_repair() storage/maria/ha_maria.cc: Give better error & warning messages for auto-repaired tables. storage/maria/ha_maria.h: Added argument to auto_repair() Always auto-repair in case of moved table. storage/maria/ma_open.c: Remove special handling of HA_ERR_OLD_FILE (this is now handled in auto_repair()) storage/myisam/ha_myisam.h: Added argument to auto_repair()
* | | | Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed ↵Michael Widenius2012-03-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in join_read_const_table on concurrent SELECT and ALTER, constant Aria table" Remove Aria state history for drop/rename mysql-test/suite/maria/r/maria-recovery2.result: Updated old (wrong) test result sql/handler.cc: Fixed wrong argument to implict_commit storage/maria/ha_maria.cc: Ensure that we don't use file->trn if THD_TRN is 0. (This means that implict_commit() has been called and the trn object is not ours anymore) storage/maria/ma_extra.c: Remove Aria state history for drop/rename storage/maria/ma_rename.c: Remove Aria state history for rename storage/maria/ma_state.c: More DBUG_PRINT
* | | | Merge 5.3->5.5Igor Babaev2012-03-172-26/+44
|\ \ \ \ | |/ / /
| * | | Merge 5.2->5.3unknown2012-03-142-26/+44
| |\ \ \ | | |/ /
| | * | Added test case for lp:905782 "Assertion `pageno < ((1ULL) << 40)' failed at ↵Michael Widenius2012-03-091-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | ma_pagecache.c:3438: pagecache_read or table corruption on INSERT into a ucs2 table" The orignal bug has been fixed earlier
| | * | Added ucs2 test moved from maria3.test. (MDEV-167)unknown2012-03-091-0/+33
| | | |
| | * | Return original checksum value inside the test.unknown2012-03-011-26/+5
| | | | | | | | | | | | | | | | Move ucs2 test in separate file (MDEV-167).
* | | | merge with mysql-5.5.21Sergei Golubchik2012-03-091-2/+2
| | | |
* | | | Merge 5.3->5.5.Igor Babaev2012-03-012-21/+68
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-02-282-21/+44
| |\ \ \ | | |/ /
| | * | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'"Michael Widenius2012-02-282-21/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was that Aria allowed too long keys to be created (so that the internal buffer was not big enough to hold the whole key). Key lengths is now limited to HA_MAX_KEY_LENGTH (1000), as for MyISAM. Fixed failure in "_ma_apply_redo_index: Assertion `new_page_length == 0", as found by buildbot. mysql-test/suite/maria/r/maria.result: Updated results mysql-test/suite/maria/r/maria3.result: Updated results. Added test for bug fix mysql-test/suite/maria/t/maria3.test: Updated results. Added test for bug fix mysql-test/suite/maria/t/optimize.test: Updated test for new max key length storage/maria/ha_maria.cc: Limit key to HA_MAX_KEY_LENGTH. storage/maria/ma_key_recover.c: Limit used page length to max page size (this is in line with the code that writes the entry to the log). This fixes failure in "_ma_apply_redo_index: Assertion `new_page_length == 0", as found by buildbot. storage/maria/ma_search.c: Extra DBUG storage/maria/ma_write.c: Added test to detect errors earlier.
| * | | Merge 5.2->5.3Sergey Petrunya2012-02-241-0/+24
| |\ \ \ | | |/ /
| | * | Automatic mergeMichael Widenius2012-02-241-0/+24
| | |\ \ | | | |/
| | | * Fix for lp:909635: MariaDB crashes on a select with long varchar and blob fieldsMichael Widenius2012-02-241-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was a crash in internal temporary (Maria) files when row length exceeded 65535 mysql-test/suite/maria/r/maria3.result: Added test case mysql-test/suite/maria/t/maria3.test: Added test case storage/maria/ma_open.c: Added support for row length > 65535. This fixes crash when using tables with longer row lengths.
* | | | 5.3.4 mergeSergei Golubchik2012-02-151-0/+66
|\ \ \ \ | |/ / /
| * | | MDEV-59 Review and push crashsafe GIS keys.Alexey Botchkov2012-02-141-0/+64
| | | | | | | | | | | | | | | | | | | | tests for RTree keys recovery.
* | | | 5.3 mergeSergei Golubchik2012-01-132-2/+23
|\ \ \ \ | |/ / /
| * | | Merge with 5.2Michael Widenius2011-12-141-0/+22
| |\ \ \ | | |/ /
| | * | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETEMichael Widenius2011-12-131-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/maria/r/maria-recovery3.result: Added test case for recovery bug mysql-test/suite/maria/t/maria-recovery3.test: Added test case for recovery bug storage/maria/ha_maria.cc: Don't print query twice to log storage/maria/ma_delete.c: More DBUG_PRINT storage/maria/ma_key_recover.c: Added new asserts to detect errors earlier storage/maria/ma_recovery.c: Update all states when moving a non-transactional file to transactional. This fixes lp:887051
| * | | Merge with 5.2.Michael Widenius2011-12-111-2/+1
| |\ \ \ | | |/ / | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
| | * | Fixed bug where automaticly zerofilled table was not part of recovery if ↵Michael Widenius2011-12-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash happended before next checkpoint. mysql-test/suite/maria/r/maria-autozerofill.result: Updated test case storage/maria/ha_maria.cc: Write create_rename_lsn for auto_zerofilled tables. storage/maria/ma_delete.c: Added DBUG_ASSERT() to find errors when deleting pages. storage/maria/ma_locking.c: Fixed typo storage/maria/ma_open.c: Don't regard file as movable if create_rename_lsn is not LSN_NEEDS_NEW_STATE_LSNS
* | | | updated results for big testsSergei Golubchik2012-01-052-3/+3
| | | |
* | | | rename debug variable to debug_dbug, to make test pass in release buildsSergei Golubchik2011-12-155-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | (and to follow the naming conventons). keep old debug variable, but mark it as deprecated.
* | | | after merge changes:Sergei Golubchik2011-12-123-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename all debugging related command-line options and variables to start from "debug-", and made them all OFF by default. * replace "MySQL" with "MariaDB" in error messages * "Cast ... converted ... integer to it's ... complement" is now a note, not a warning * @@query_cache_strip_comments now has a session scope, not global.
* | | | 5.3->5.5 mergeSergei Golubchik2011-11-274-20/+8
|\ \ \ \ | |/ / /
| * | | Made the optimizer switch for index condition pushdown set to 'on' by default. Igor Babaev2011-11-211-4/+4
| | | |
| * | | merging.Alexey Botchkov2011-11-126-19/+152
| |\ \ \
| * | | | PostGIS-style 'same point' handling.Alexey Botchkov2011-09-013-300/+303
| | | | |
| * | | | gis-related tests fixes.Alexey Botchkov2011-06-207-421/+680
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | merging.
* | \ \ \ \ 5.3->5.5 mergeSergei Golubchik2011-11-222-15/+17
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fixed a cost estimation bug introduced into in the function best_access_pathIgor Babaev2011-09-301-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the 5.3 code line after a merge with 5.2 on 2010-10-28 in order not to allow the cost to access a joined table to be equal to 0 ever. Expanded data sets for many test cases to get the same execution plans as before.
| * | | | | Merge 5.2->5.3unknown2011-09-021-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Added variable ARIA_CHECKPOINT_LOG_ACTIVITY to allow one to specify how ↵Michael Widenius2011-09-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | often we should do a checkpoint. Added more error printing to log if log_warnings > 2 Give an error if checkpoint record is not correct, mysql-test/suite/maria/r/compat_aliases.result: Added ARIA_CHECKPOINT_LOG_ACTIVITY mysql-test/suite/maria/r/maria3.result: Added ARIA_CHECKPOINT_LOG_ACTIVITY storage/maria/ha_maria.cc: Added ARIA_CHECKPOINT_LOG_ACTIVITY Added more error printing to log if log_warnings > 2 Added db and table name to error message when printing to log storage/maria/ma_check.c: Fixed bug where we didn't reset some variables between repair() calls storage/maria/ma_checkpoint.c: Made maria_checkpoint_min_activity global. Don't do checkpoint if no data logged. Changed test for if we should do checkpoint to test separately for if log has grown or if we have had a lot of of cache writes. storage/maria/ma_recovery.c: Give an error if checkpoint record is not correct storage/maria/trnman.c: Don't print not needed long_transaction_id entries for checkpoints.
* | | | | | merge with 5.3Sergei Golubchik2011-10-1911-119/+571
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * | | | | Merge with 5.2Michael Widenius2011-08-161-42/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed wrong testcaseMichael Widenius2011-08-161-42/+0
| | | | | |
| * | | | | Automatic merge with 5.2Michael Widenius2011-08-152-0/+106
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge in bug fix from 5.1Michael Widenius2011-08-151-0/+31
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fixed bug lp:826377 "Aria DB Format: Reading specific table from dump causes ↵Michael Widenius2011-08-151-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong bytesec" The bug was that when using bulk insert combined with lock table, we intitalized the io cache with the wrong file position. This fixed a bug where MariaDB could not read in a table dump done with mysqldump. mysql-test/suite/maria/r/locking.result: Test case for locking + write cache bug mysql-test/suite/maria/t/locking.test: Test case for locking + write cache bug storage/maria/ma_extra.c: Initialize write cache used with bulk insert to correct file length. (The old code didn't work if one was using LOCK TABLE for the given table).
| | * | | | Fixes bugs found by testcase for lp:815022 and lp:726374 ↵Michael Widenius2011-08-151-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "ma_blockrec.c:3000: write_block_record: Assertion `cur_block[1].page_count == 0' failed with a multi-index Aria workload" The issues was: - For some tables with a lot of not packed fields, we didn't allocate enough memory in head page which caused DBUG_ASSERT's - Removed wrong DBUG_ASSERT() - Fixed a problem with underflow() where it generates a key page where all keys didn't fit. - Max key length is now limited by block_size/3 (was block_size /2). This is required for underflow() to work with packed keys. mysql-test/lib/v1/mysql-test-run.pl: Remove --alignment=8 as this doesn't work on 64 bit systems mysql-test/suite/maria/r/small_blocksize.result: Test case for Aria bug mysql-test/suite/maria/t/small_blocksize-master.opt: Test case for Aria bug mysql-test/suite/maria/t/small_blocksize.test: Test case for Aria bug storage/maria/ha_maria.cc: Fixed comment storage/maria/ma_bitmap.c: Fixed wrong variable usage in find_where_to_split_row() where we allocated too little memory for head page. We did not take into account space for head extents (long VARCHAR) when trying to split row on head page. This caused us to allocate too little space from bitmap which lead to ASSERT failures later. storage/maria/ma_blockrec.c: Made some argument const (to ensure they was not accidently changed) Removed wrong DBUG_ASSERT() storage/maria/ma_blockrec.h: Removed not used variable storage/maria/ma_delete.c: Added my_afree() in case of error More comments and DBUG_ASSERT() for underflow() storage/maria/ma_open.c: Make keyinfo->underflow_block_length smaller for packed keys. This has to be done as for long packed keys, underflow() otherwise generates a key page where all keys didn't fit. storage/maria/ma_page.c: New DBUG_ASSERT() storage/maria/ma_write.c: Fixed comment storage/maria/maria_def.h: We have to have space for at least 3 keys on a key page. (Otherwise the underflow() code doesn't work for packed keys, even when we have an underflow() for an empty key page)
| * | | | | Automerge 5.2->5.3unknown2011-08-011-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | After-merge fix of result file (MARIA <-> Aria)unknown2011-08-011-2/+2
| | | | | |
| * | | | | Automerge 5.2->5.3unknown2011-07-311-0/+56
| |\ \ \ \ \ | | |/ / / /
View Lorry Controller Status