mariadb

Commit Graph

Author	SHA1	Message	Date
Michael Widenius	1a5de5bc82	Changed all file names in maria to LEX_STRING and removed some calls to strlen() Ensure that pagecache gives correct error number even if error for block happend mysys/my_pread.c: Indentation fix storage/maria/ha_maria.cc: filenames changed to be of type LEX_STRING storage/maria/ma_check.c: filenames changed to be of type LEX_STRING storage/maria/ma_checkpoint.c: filenames changed to be of type LEX_STRING storage/maria/ma_create.c: filenames changed to be of type LEX_STRING storage/maria/ma_dbug.c: filenames changed to be of type LEX_STRING storage/maria/ma_delete.c: filenames changed to be of type LEX_STRING storage/maria/ma_info.c: filenames changed to be of type LEX_STRING storage/maria/ma_keycache.c: filenames changed to be of type LEX_STRING storage/maria/ma_locking.c: filenames changed to be of type LEX_STRING storage/maria/ma_loghandler.c: filenames changed to be of type LEX_STRING storage/maria/ma_open.c: filenames changed to be of type LEX_STRING storage/maria/ma_pagecache.c: Store error number for last failed operation in the page block This should fix some asserts() when errno was not properly set after failure to read block in another thread storage/maria/ma_recovery.c: filenames changed to be of type LEX_STRING storage/maria/ma_update.c: filenames changed to be of type LEX_STRING storage/maria/ma_write.c: filenames changed to be of type LEX_STRING storage/maria/maria_def.h: filenames changed to be of type LEX_STRING storage/maria/maria_ftdump.c: filenames changed to be of type LEX_STRING storage/maria/maria_pack.c: filenames changed to be of type LEX_STRING	18 years ago
Michael Widenius	d145362edf	Fix for bug#38484 DELETE causes crash or index corruption There is no test cases as it's not trivial to do a test case for this. The new code for Maria is however executed by the test case in the bug report. mysql-test/mysql-test-run.pl: Avoid warnings when running with --extern storage/maria/ha_maria.cc: Disable not complete assert until Sanja can push a proper fix storage/maria/ma_delete.c: Fix that pageflag for page is calculated based on original values storage/maria/ma_search.c: Ensure that prev_length structure variable is properly reset when not used storage/myisam/mi_search.c: Ensure that prev_length structure variable is properly reset when not used	18 years ago
Michael Widenius	57e0bdb306	Automatic merge	18 years ago
Michael Widenius	ea31b1e6ec	Fixes for Bug #38016 Maria: trying to access freed memory when committing a transaction Don't write out states if they haven't changed sql/sql_base.cc: Call extra(HA_EXTRA_PREPARE_FOR_DROP) before doing a drop of a table More DBUG sql/sql_table.cc: Call extra(HA_EXTRA_PREPARE_FOR_RENAME) before renaming a table storage/maria/ha_maria.cc: Ensure that file->trn is set when we call extra(HA_EXTRA_PREPARE_FOR_DROP/RENAME) storage/maria/ma_close.c: When doing close, assert if we have pointers in trn->table_list that points to the MARIA_SHARE storage/maria/ma_extra.c: Reset info->state_start in case of drop/rename. This fixes the problem of accessing freed memory in repair Don't write state changed if they haven't changed storage/maria/ma_open.c: Reset share->changed after we have written out a state (speed optimization to not write states when they haven't changed) storage/maria/ma_state.c: Decrement share->in_trans properly in DBUG_BINARY to ensure that the DBUG_ASSERT() in maria_close() works More DBUG	18 years ago
Sergei Golubchik	edb33da737	Bug#38466 maria: range query returns no data storage/maria/ma_search.c: when we found a matching key on the node page and want to search in the left leaf we must use only SEARCH_FIND flag, and never SEARCH_BIGGER, SEARCH_SMALLER, or SEARCH_LAST	18 years ago
Sergei Golubchik	47a82ad552	Bug#38135 Assertion failed: save_errno, file .\ma_update.c, line 200 typo fixed. mysql-test/r/maria.result: new test case mysql-test/t/maria.test: new test case sql/sql_select.cc: ctags friendly storage/maria/ma_blockrec.c: typo fixed	18 years ago
Michael Widenius	9e7626532b	Auto merge mysql-test/r/maria2.result: Manual merge	18 years ago
Michael Widenius	50fa1eb8b5	Fixing bug when using alter table on locked maria table Reset history when we reenable logging for transactional tables (safety fix) mysql-test/r/maria2.result: New results mysql-test/t/maria2.test: Added test case for alter table on locked maria table mysql-test/valgrind.supp: Added suppression rules for warnings in libc / libld storage/maria/ma_extra.c: Remove table from trnman list if we are going to drop or rename it; We don't want not existing shares in the list when we do commit! storage/maria/ma_recovery.c: Ensure that info->state don't point to history event when we disable logging for a table; This is needed as alter table will first do commit and then unlock, which would cause us to access a non existing object when we reenable logging. Reset history when we reenable logging (safety fix) storage/maria/ma_state.c: Do less work when share->now_transactional is not set. (Safety fix) Added function to remove shares to be deleted from trnman->used_tables Added function to reset history to current context storage/maria/ma_state.h: Prototypes for new function	18 years ago
Guilhem Bichot	6f8b889ae5	Fix for BUG#38018 INSERT SELECT ON DUPLICATE KEY UPDATE and LOAD DATA CONCURRENT REPLACE used TL_WRITE_CONCURRENT_INSERT though they may update/delete a row. This could cause concurrent SELECTs to see a changing table while the SELECT happens, or if the query was made of a group of SELECTs, some SELECTs would see different versions of the table. And anyway versioning in Maria was so far coded to support only insertions. REPLACE SELECT, INSERT VALUES ON DUPLICATE KEY UPDATE, LOAD DATA REPLACE were ok. mysql-test/r/maria2.result: result. Without the code fix, the assertion added to ha_maria::update_row() would fire twice. mysql-test/t/maria2.test: test when INSERT ON DUPLICATE KEY UPDATE and LOAD DATA CONCURRENT REPLACE do update rows storage/maria/ha_maria.cc: Assert that update_row and delete_row never see TL_WRITE_CONCURRENT_INSERT. INSERT SELECT ON DUPLICATE KEY UPDATE and LOAD DATA CONCURRENT REPLACE must upgrade TL_WRITE_CONCURRENT_INSERT to TL_WRITE because they may update/delete a row.	18 years ago
Guilhem Bichot	dddc6fd2ef	Porting bugfix made by Serg (for bug37276_reduced_corruption.sql of BUG#37276 "Maria: various index corruption, block format assertion failure") from 6.0-maria to 5.1-maria.	18 years ago
Guilhem Bichot	eb548dc32f	missing DBUG_RETURN, was causing crashes when run with --default-storage-engine=maria in tests main.func_misc main.grant_cache_no_prot main.lowercase_table_grant main.mysql_client_test main.query_cache main.query_cache_notembedded main.query_cache_ps_no_prot storage/maria/ha_maria.cc: missing DBUG_RETURN	18 years ago
Guilhem Bichot	8de480a278	Merge of latest mysql-maria	18 years ago
Guilhem Bichot	71f72bad3f	Fix for BUG#37873 "Client gets ok from INSERT VALUES before commit record is on disk": this was true also for INSERT SELECT, UPDATE, DELETE. This fix will be removed when Maria supports COMMIT/ROLLBACK ("Maria 2.0"), because then Maria will trans_register_ha() and so participate in ha_commit_trans(). Without the fix, the assertion added to ha_maria::external_lock() fires many times in maria.test. sql/sql_parse.cc: Before sending OK to client, commit transaction in Maria. storage/maria/ha_maria.cc: Assertion added to external_lock() when committing: OK should not have been sent yet (ACID). In ha_maria::implicit_commit(), possibility to not create a new transaction, this is used before net_end_statement(), when the next step is close_thread_tables(); in this use case, ha_maria::implicit_commit() should not commit if under LOCK TABLES. storage/maria/ha_maria.h: new prototype	18 years ago
Michael Widenius	7f02282404	Fixes for bug#37276: - Fixes key corruption where pages wasn't marked that they contained transid. - Fixed bug in block record that could create too small rows when transid was removed. This fixed some asserts() when testing block length Added --abort-source-on-error to the mysql client. (Very helpfull when debugging wrong .sql files) client/client_priv.h: Added enum for new option to mysql client/mysql.cc: Added new option --abort-source-on-error to allow one to get 'source' to stop on error. This is 0 by default, to keep old behaviour. Print file name and line number when getting an error when doing source filename sql/field.cc: Removed old dead code sql/sql_class.cc: Removed old dead code storage/maria/ma_blockrec.c: Added checking of min block length to check_directory() When creating new directory entry, set length to 0; This ensures that the assert checks() on block lengths works properly. Added more DBUG_ASSERT() and more calls to check_directory() In get_head_or_tail_page(), send in correct min_block_length. This is now safe as the length of new blocks are now 0 storage/maria/ma_delete.c: When moving key to parent page, mark page if key has transid storage/maria/ma_write.c: Fixed bug where _ma_find_last_pos() didn't set int_key->flag. Simpilifed code by unrolling loop.	18 years ago
Guilhem Bichot	942b38794f	Test for fix made by Monty for BUG#37276 (CHECK TABLE said Invalid key block position: 15731098820608 key +# block size: 8192 file_length: 425984). Other corruption cases still not fixed. Without the fix, the test would yield the corruption message in CHECK TABLE. mysql-test/r/maria-big2.result: result mysql-test/t/maria-big2.test: test for bugfix	18 years ago
Guilhem Bichot	81d3d3ac42	- lifting a limit: INSERT\|REPLACE SELECT and LOAD DATA always prevented versioning, now what do so is if the table is empty. - lifting another limit: versioning was disabled if table had more than one unique index - correcting test of statement-based binlogging, when converting read locks to TL_READ_NO_INSERT KNOWN_BUGS.txt: removing mostly fixed limitation (see ha_maria.cc) mysql-test/r/maria-mvcc.result: result update mysql-test/t/maria-mvcc.test: now when table is empty it does not do versioning, so test hung; inserting one row at start of the test, to enable versioning. sql/sql_parse.cc: Maria team wrongly removed this "break", thanks Davi for noticing storage/maria/ha_maria.cc: - We used to prevent versioning in INSERT/REPLACE SELECT and LOAD DATA, because the index rebuild done by bulk insert sometimes, is unsafe when versioning is on. Here we change that: in store_lock(), if the table is empty (which is required for index rebuild to be used), we disable versioning; in start_bulk_insert(), we don't do index rebuild if versioning is enabled. - Test for statement-based binlogging was incomplete: statement-based binlogging is on for this statement if binlog is open and statement has binlogging enabled and statement is not doing row-based binlogging storage/maria/ma_open.c: Monty and I agreed that it's ok to have versioning on a table with more than one unique index: if an INSERT hits a duplicate key when inserting the second index' key, no other thread should be able to touch the first index' just-inserted key, because that key has an uncommitted transaction id, so the first thread should have time to remove the first index' key.	18 years ago
Guilhem Bichot	60b88ce475	Fix for BUG#37876 "Importing Maria table from other server via binary copy does not work": - after auto-zerofill (ha_maria::check_and_repair()) kepts its state's LSNs unchanged, which could be the same as the create_rename_lsn of another pre-existing table, which would break versioning as this LSN serves as unique identifier in the versioning code (in maria_open()). Even the state pieces which maria_zerofill() did change were lost (because they didn't go to disk). - after this fix, if two tables were auto-zerofilled at the same time (by _ma_mark_changed()) they could receive the same create_rename_lsn, which would break versioning again. Fix is to write a log record each time a table is imported. - Print state's LSNs (create_rename_lsn, is_of_horizon, skip_redo_lsn) and UUID in maria_chk -dvv. mysql-test/r/maria-autozerofill.result: result mysql-test/t/maria-autozerofill.test: Test for auto-zerofilling storage/maria/ha_maria.cc: The state changes done by auto-zerofilling never reached disk. storage/maria/ma_check.c: When zerofilling a table, including its pages' LSNs, new state LSNs are needed next time the table is imported into a Maria instance. storage/maria/ma_create.c: Write LOGREC_IMPORTED_TABLE when importing a table. This is informative and ensures that the table gets a unique create_rename_lsn even though multiple tables are imported by concurrent threads (it advances the log's end LSN). storage/maria/ma_key_recover.c: comment storage/maria/ma_locking.c: instead of using translog_get_horizon() for state's LSNs of imported table, use the LSN of to-be-written LOGREC_IMPORTED_TABLE. storage/maria/ma_loghandler.c: New type of log record storage/maria/ma_loghandler.h: New type of log record storage/maria/ma_loghandler_lsn.h: New name for constant as can be used not only by maria_chk but auto-zerofill now too. storage/maria/ma_open.c: instead of using translog_get_horizon() for state's LSNs of imported table, use the LSN of to-be-written LOGREC_IMPORTED_TABLE. storage/maria/ma_recovery.c: print content of LOGREC_IMPORTED_TABLE in maria_read_log. storage/maria/maria_chk.c: print info about LSNs of the table's state, and UUID, when maria_chk -dvv storage/maria/maria_pack.c: new name for constant storage/maria/unittest/ma_test_recovery.pl: Now that maria_chk -dvv shows state LSNs and UUID those need to be filtered out, as maria_read_log -a does not use the same as at original run.	18 years ago
Michael Widenius	f9ef13d562	Automatic merge	18 years ago
Michael Widenius	82d7938905	Bug#37276 maria crash on insert around the time check table is run Fixed several (but not all) issues found by the test program: - ASSERT on row_length in ma_blockrec.c::_ma_compact_block_page() - Fixed bug when splitting node pages - Fixed hang in 'closeing tables' (conflicting mutex order) by ensuring we first take trnman lock and then share->intern_lock storage/maria/ma_blockrec.c: When compacting a row page when allocating space for a new row, the min length of a the new block may be temporarly smaller than 'min_block_length'. storage/maria/ma_check.c: More DBUG output storage/maria/ma_checkpoint.c: Call new function _ma_remove_not_visible_states_with_lock() to ensure we first take lock on trnman and then on share->intern_lock + storage/maria/ma_close.c: Added comment storage/maria/ma_open.c: Added comment storage/maria/ma_search.c: Copy also node data; Caused bug when splitting node pages storage/maria/ma_state.c: Added _ma_remove_not_visible_states_with_lock() to ensure we take locks in right order storage/maria/ma_state.h: Added new prototype storage/maria/trnman.c: Added trnman_lock() and trnman_unlock(). Needed by _ma_remove_not_visible_states_with_lock() to get mutex in right order storage/maria/trnman_public.h: Added new prototypes	18 years ago
Guilhem Bichot	4d48802fde	Fix for BUG#35107 "maria-preload.test is disabled because unrepeatable page cache statistics" What varies accross machine is maria_pagecache_read_requests, but maria_pagecache_reads doesn't and is the most interesting (helps verify that disk wasn't touched after preloading), that's all we keep. mysql-test/r/maria-preload.result: unrepeatable variable removed mysql-test/t/maria-preload.test: unrepeatable variable removed storage/maria/ma_test_force_start.pl: portability fix for running under Windows	18 years ago
Guilhem Bichot	47f01c4284	Re-enabling maria-preload.test, to see if it is repeatable on all machines. mysql-test/r/maria-preload.result: new result. mysql-test/t/disabled.def: re-enabling test mysql-test/t/maria-preload.test: Background dirty pages flushing may influence page cache stats	18 years ago
Guilhem Bichot	3e37fb35b1	Back-port of changes made to 6.0-maria (to remove compiler warnings or fix simple test failures) in the last days: substitution in tests has to work for absolute datadir (/dev/shm/...); internal temp tables (like information_schema) can be Maria; Maria may not be compiled in; splitting too long maria.test in two; mtr --embedded runs in mysql-test not mysql-test/var/master-data so we need some absolute paths in tests; can't restart mysqld in --embedded; missing DBUG_VOID_RETURN in mysqltest.c (fix from Serg); is_collation_character_set_applicability.test was too long name which broke tar's 99-char limit.	18 years ago
Guilhem Bichot	6559f5c229	cutting test in two because it takes many things mysql-test/r/maria-recovery.result: cutting test in two mysql-test/r/maria-recovery2.result: cutting test in two mysql-test/t/maria-recovery.test: cutting test in two mysql-test/t/maria-recovery2-master.opt: cutting test in two mysql-test/t/maria-recovery2.test: cutting test in two	18 years ago
Guilhem Bichot	2425763869	Fix for BUG#37288 "Maria - zerofill corrupts table". Testcase is running ma_test_recovery.pl on Windows. storage/maria/ma_blockrec.c: comment storage/maria/ma_check.c: When zerofilling the data file, _ma_compact_block_page() may increase free space in a page so bitmap page needs to be corrected.	18 years ago
Guilhem Bichot	fdebe2788f	Fix for BUG#35107 "maria-preload.test is disabled because causes assertion". maria-preload will be re-enabled later because other pieces of it have possibly random output. storage/maria/ma_check.c: Fix for BUG#35107 "maria-preload.test is disabled because causes assertion".	18 years ago
Guilhem Bichot	0432bc1e95	Fix for unit test failures. storage/maria/ma_test1.c: rec_length was too short by one byte: at line 299 memcpy(record,read_record,rec_length) thus didn't copy the last byte, so 'record' was not ok for use by update_record(), contained an incomplete blob address, sometimes crashed on Itanium. storage/maria/unittest/ma_test_loghandler_multithread-t.c: Tests failed once, never before for hundreds of times, we don't know if test is correct, disabling.	18 years ago
Michael Widenius	f27efe69f5	Disable versioning (concurrent writes) if more than one unique key The reason for this is that if we change one unique key and then get a failure on the second, we may not be able to rename the first one back before someone else writes the same key value. In Maria 2.0, when we keep deleted key values in the tree, this will not be a problem anymore Fixed typedisable concurrent insert/select for SQLCOM_LOAD as there are problems with concurrent threads during index recreation KNOWN_BUGS.txt: More comments storage/maria/ha_maria.cc: Fixed typo (REPLACE -> INSERT) Also disable concurrent insert/select for SQLCOM_LOAD as there are problems with concurrent threads during index recreation storage/maria/ma_open.c: Disable versioning (concurrent writes) if more than one unique key	18 years ago
Michael Widenius	c580583756	Automatic merge Added some minor changes that was done in my tree while waiting for test to run: - Remove in Maria T_QUICK when retrying repair for enabling indexes, as the record file may be in use by other threads - Disable code that is only relevant for EXTERNAL_LOCKING include/m_string.h: Automatic merge storage/maria/ha_maria.cc: Remove T_QUICK when retrying repair for enabling indexes, as the record file may be in use by other threads storage/maria/ma_check.c: Automatic merge storage/maria/ma_key.c: Automatic merge storage/maria/ma_loghandler.c: Automatic merge storage/maria/ma_open.c: Disable code that is only relevant for EXTERNAL_LOCKING storage/maria/ma_sp_key.c: Automatic merge storage/maria/ma_write.c: Automatic merge storage/maria/trnman.c: Automatic merge	18 years ago
Michael Widenius	d29e7f7472	Fix for Bug #37007 Maria: different checksum for MyISAM table depending on CHECKSUM=0\|1 This also adds a check that MyISAM tables with incompatible checksums are detected by CHECK TABLE ... [FOR UPGRADE] and thus also by mysql_upgrade. The tables that are incomatible are MyISAM tables with ROW_FORMAT=fixed and has VARCHAR fields and have CHECKSUM enabled. Before these tables gave different checksum if you used CHECK TABLE with or without EXTENDED mysql-test/r/old-mode.result: Now we get same results with and without EXTENDED mysql-test/r/row-checksum-old.result: Initial results mysql-test/r/row-checksum.result: Initial results mysql-test/t/old-mode.test: Added test with QUICK to show that the live checksum is not used when running with --old mysql-test/t/row-checksum-old-master.opt: Start mysqld with --old mode to enable old checksum code mysql-test/t/row-checksum-old.test: Run row-checksum test under mysqld --old mysql-test/t/row-checksum.test: Verify that checksum are calculated the same way with and without EXTENDED We run this with several storage engines to ensure results are the same over storage engines sql/ha_partition.cc: Use new HA_HAS_xxx_CHECKSUM flags sql/handler.cc: Use new HA_HAS_xxx_CHECKSUM flags sql/handler.h: Split HA_HAS_CHECKSUM into HA_HAS_NEW_CHECKSUM and HA_HAS_OLD_CHECKSUM flags. This is a safe API change as only MyISAM and Maria should use these handler flags. sql/sql_show.cc: Use new HA_HAS_xxx_CHECKSUM flags sql/sql_table.cc: Use file->checksum() for live checksums if the life checksum method corresponds to the mysqld --old flag storage/maria/ha_maria.cc: Use new HA_HAS_xxx_CHECKSUM flags storage/myisam/ha_myisam.cc: Set HA_HAS_OLD_CHECKSUM and/or HA_HAS_NEW_CHECKSUM flags depending on if this is a new myisam or old myisam file Add method check_for_upgrade() to detect if the table is of old version with a checksum that is incompatible with CHECK TABLE ... EXTENDED storage/myisam/ha_myisam.h: Added check_for_upgrade() storage/myisam/mi_open.c: Removed not neede cast Initialize share->has_null_fields and share->has_varchar_fields variables storage/myisam/myisamdef.h: Added share->has_null_fields and share->has_varchar_fields	18 years ago
Sergei Golubchik	97a0501e92	fix for a strict aliasing issue with gcc 3.4.3 on sol10-amd64-a	18 years ago
Michael Widenius	9f589947b8	Fix for Bug #36578 Maria: maria-recover may fail to autorepair a table Fixed also some similar issues in MyISAM. This was not noticed before as MyISAM did a second retry without key cache (which just made the second repair attempty slower) storage/maria/ha_maria.cc: Print information if we retry without quick in case of CHECK TABLE table_name QUICK Remove T_QUICK flag when retrying repair, but set T_SAFE_REPAIR to ensure we don't loose any rows Remember T_RETRY_WITH_QUICK flag when restoring repair flags Don't print 'checking table' if we are not checking table in auto-repair Don't use T_QUICK in auto repair (safer) Changed parameter of type HA_PARAM &param to HA_PARAM param storage/maria/ha_maria.h: Changed parameter of type HA_PARAM &param to HA_PARAM param storage/maria/ma_check.c: Added retry without T_QUICK if there is a problem reading a row in BLOCK_RECORD storage/myisam/ha_myisam.cc: Remove T_QUICK flag when retrying repair, but set T_SAFE_REPAIR to ensure we don't loose any rows Remember T_RETRY_WITH_QUICK flag when restoring repair flags	18 years ago
unknown	38d024b577	merge	18 years ago
unknown	7b8d4af166	Fixed maria-big test failure. storage/maria/ma_loghandler.c: Processed case when current buffer filled but there is no new LSN in the buffer generated (so it is no need to fluesh this buffer) and buffer->last_lsn is LSN_IMPOSSIBLE.	18 years ago
Guilhem Bichot	f0c53638d7	Fixes for build errors under Windows and compiler warning under Linux include/m_string.h: new macro like LINT_INIT but for struct. In m_string.h because bzero() becomes available only there storage/maria/ma_check.c: compiler error under Windows (declaration after statements...) storage/maria/ma_key.c: trnman.h is not in include/ but in storage/maria storage/maria/ma_sp_key.c: trnman.h is not in include/ but in storage/maria storage/maria/ma_write.c: avoid compiler warning (org_key.flag may be used uninitialized)	18 years ago
Michael Widenius	1d72603832	Merge; No notable changes .bzr-mysql/default.conf: Automatic merge config/ac-macros/plugins.m4: Automatic merge configure.in: Automatic merge include/my_global.h: Automatic merge mysql-test/include/maria_empty_logs.inc: Use Guilmhems version, but don't echo use database mysql-test/r/maria-no-logging.result: Automatic merge mysql-test/r/maria-page-checksum.result: Automatic merge mysql-test/r/maria-recover.result: Automatic merge mysql-test/r/maria2.result: Automatic merge mysql-test/t/maria-no-logging.test: Automatic merge mysql-test/t/maria-page-checksum.test: Automatic merge mysql-test/t/maria-purge.test: Automatic merge mysql-test/t/maria-recover.test: Automatic merge mysql-test/t/maria2.test: Automatic merge sql/sql_table.cc: Automatic merge storage/maria/CMakeLists.txt: Automatic merge storage/maria/ma_ft_parser.c: Automatic merge storage/maria/ma_loghandler.c: Automatic merge storage/maria/ma_recovery.c: Automatic merge storage/maria/ma_rt_test.c: Manual merge storage/maria/ma_state.c: Automatic merge storage/maria/ma_test_force_start.pl: Automatic merge storage/maria/plug.in: Automatic merge storage/maria/unittest/CMakeLists.txt: Automatic merge storage/maria/unittest/Makefile.am: Automatic merge storage/maria/unittest/ma_test_all-t: Automatic merge storage/maria/unittest/ma_test_loghandler_multithread-t.c: Automatic merge storage/maria/unittest/ma_test_recovery.pl: Automatic merge storage/myisam/rt_test.c: Automatic merge	18 years ago
Michael Widenius	52cb0c24a6	Added versioning of Maria index Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey Renamed old info->lastkey to info->lastkey_buff Use exact key lenghts for keys, not USE_WHOLE_KEY For partial key searches, use SEARCH_PART_KEY When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid Changes done in a lot of files: - Modified functions to use MARIA_KEY instead of key pointer and key length - Use keyinfo->root_lock instead of share->key_root_lock[keynr] - Simplify code by using local variable keyinfo instead if share->keyinfo[i] - Added #fdef EXTERNAL_LOCKING around removed state elements - HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid) - Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it .bzrignore: Added missing temporary directory extra/Makefile.am: comp_err is now deleted on make distclean include/maria.h: Added structure MARIA_KEY, which is used for intern key objects in Maria. Changed functions to take MARIA_KEY as an argument instead of pointer to packed key. Changed some functions that always return true or false to my_bool. Added virtual function make_key() to avoid if in _ma_make_key() Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster include/my_base.h: Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check() Added SEARCH_INSERT to be used when inserting new keys Added SEARCH_PART_KEY for partial searches Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid include/my_handler.h: Make next_flag 32 bit to make sure we can handle all SEARCH_ bits mysql-test/include/maria_empty_logs.inc: Read and restore current database; Don't assume we are using mysqltest. Don't log use databasename to log. Using this include should not cause any result changes. mysql-test/r/maria-gis-rtree-dynamic.result: Updated results after adding some check table commands to help pinpoint errors mysql-test/r/maria-mvcc.result: New tests mysql-test/r/maria-purge.result: New result after adding removal of logs mysql-test/r/maria-recovery-big.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-bitmap.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-rtree-ft.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria.result: New tests mysql-test/r/variables-big.result: Don't log id as it's not predictable mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result: Updated results to new binlog results. (Test has not been run in a long time as it requires --big) mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt: Moved file to ndb replication test directory mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test: Fixed wrong path to included tests mysql-test/t/maria-gis-rtree-dynamic.test: Added some check table commands to help pinpoint errors mysql-test/t/maria-mvcc.test: New tests mysql-test/t/maria-purge.test: Remove logs to make test results predictable mysql-test/t/maria.test: New tests for some possible problems mysql-test/t/variables-big.test: Don't log id as it's not predictable mysys/my_handler.c: Updated function comment to reflect old code Changed nextflag to be uint32 to ensure we can have flags > 16 bit Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored. Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag mysys/my_lock.c: Fixed wrong test (Found by Guilhem) scripts/Makefile.am: Ensure that test programs are deleted by make clean sql/rpl_rli.cc: Moved assignment order to fix compiler warning storage/heap/hp_write.c: Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys storage/maria/Makefile.am: Remove also maria log files when doing make distclean storage/maria/ha_maria.cc: Use 'file->start_state' as default state for transactional tables without versioning At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows) In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event. Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave storage/maria/ma_blockrec.c: Updated comment storage/maria/ma_check.c: Compact key pages (removes transid) when doing --zerofill Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid Modified functions to use MARIA_KEY instead of key pointer and key length Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn() Removed not needed argument from get_record_for_key() Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL Remove some SPATIAL specific code where the virtual functions can handle this in a general manner Use info->lastkey_buff instead of info->lastkey _ma_dpos() -> _ma_row_pos_from_key() _ma_make_key() -> keyinfo->make_key() _ma_print_key() -> _ma_print_keydata() _ma_move_key() -> ma_copy_copy() Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Ensure that data on page doesn't overwrite page checksum position Use DBUG_DUMP_KEY instead of DBUG_DUMP Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp() Fixed check if rowid points outside of BLOCK_RECORD data file Use info->lastkey_buff instead of key on stack in some safe places Added #fdef EXTERNAL_LOCKING around removed state elements storage/maria/ma_close.c: Use keyinfo->root_lock instead of share->key_root_lock[keynr] storage/maria/ma_create.c: Removed assert that is already checked in maria_init() Force transactinal tables to be of type BLOCK_RECORD Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD) Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. storage/maria/ma_dbug.c: Changed _ma_print_key() to use MARIA_KEY storage/maria/ma_delete.c: Modified functions to use MARIA_KEY instead of key pointer and key length info->lastkey2-> info->lastkey_buff2 Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Use new interface for get_key(), _ma_get_last_key() and others _ma_dpos() -> ma_row_pos_from_key() Simplify setting of prev_key in del() Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid Treath key pages that may have a transid as if keys would be of variable length storage/maria/ma_delete_all.c: Reset history state if maria_delete_all_rows() are called Update parameters to _ma_update_state_lsns() call storage/maria/ma_extra.c: Store and restore info->lastkey storage/maria/ma_ft_boolean_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ft_nlq_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing) storage/maria/ma_ft_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ftdefs.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_fulltext.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_init.c: Check if blocksize is legal (Moved test here from ma_open()) storage/maria/ma_key.c: Added functions for storing/reading of transid Modified functions to use MARIA_KEY instead of key pointer and key length Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys Add transid to keys if table is versioned Added _ma_copy_key() storage/maria/ma_key_recover.c: Add logging of page_flag (holds information if there are keys with transid on page) Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive Added lots of DBUG_PRINT() Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE storage/maria/ma_key_recover.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_locking.c: Added new arguments to _ma_update_state_lsns_sub() storage/maria/ma_loghandler.c: Fixed all logging of LSN to look similar in DBUG log Changed if (left != 0) to if (left) as the later is used also later in the code storage/maria/ma_loghandler.h: Added new index page operations storage/maria/ma_open.c: Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned This is needed to not get double increments of state.records (one in ma_write.c and on when log is written) Changed info->lastkey to MARIA_KEY type Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled) Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Check on open that state.create_trid is correct Extend share->base.max_key_length in case of transactional table so that it can hold transid Removed 4.0 compatible fulltext key mode as this is not relevant for Maria Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block Initialize all new virtual function pointers Removed storing of state->unique, state->process and store state->create_trid instead storage/maria/ma_page.c: Added comment to describe key page structure Added functions to compact key page and log the compact operation storage/maria/ma_range.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search Added handling of pages with transid storage/maria/ma_recovery.c: Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal Added new arguments to _ma_update_state_lsns() storage/maria/ma_rename.c: Added new arguments to _ma_update_state_lsns() storage/maria/ma_rkey.c: Modified functions to use MARIA_KEY instead of key pointer and key length Don't use USE_WHOLE_KEY, use real length of key Use share->row_is_visible() to test if row is visible Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once Removed test if last_used_keyseg != 0 as this is always true storage/maria/ma_rnext.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rnext_same.c: Modified functions to use MARIA_KEY instead of key pointer and key length lastkey2 -> lastkey_buff2 storage/maria/ma_rprev.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rsame.c: Updated comment Simplify code by using local variable keyinfo instead if share->keyinfo[i] Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rsamepos.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_index.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use better variable names Removed not needed casts _ma_dpos() -> _ma_row_pos_from_key() Use info->last_rtree_keypos to save position to key instead of info->int_keypos Simplify err: condition Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function storage/maria/ma_rt_index.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_key.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify maria_rtree_add_key by combining idenitcal code and removing added_len storage/maria/ma_rt_key.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_mbr.c: Changed type of 'nextflag' to uint32 Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value storage/maria/ma_rt_mbr.h: Changed type of 'nextflag' to uint32 storage/maria/ma_rt_split.c: Modified functions to use MARIA_KEY instead of key pointer and key length key_length -> key_data_length to catch possible errors storage/maria/ma_rt_test.c: Fixed wrong comment Reset recinfo to avoid valgrind varnings Fixed wrong argument to create_record() that caused test to fail storage/maria/ma_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Added support of keys with optional trid Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads _ma_dpos() -> _ma_row_pos_from_key() If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search() Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data) Combine similar code at end of _ma_get_binary_pack_key() Removed not used function _ma_move_key() In _ma_search_next() don't call _ma_search() if we aren't on a nod page. Update info->cur_row.trid with trid for found key Removed some not needed casts Added _ma_trid_from_key() Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller storage/maria/ma_sort.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_sp_defs.h: _ma_sp_make_key() now fills in and returns (MARIA_KEY ) value storage/maria/ma_sp_key.c: _ma_sp_make_key() now fills in and returns (MARIA_KEY ) value Don't test sizeof(double), test against 8 as we are using float8store() Use mi_float8store() instead of doing swap of value (same thing but faster) storage/maria/ma_state.c: maria_versioning() now only calls _ma_block_get_status() if table supports versioning Added _ma_row_visible_xxx() functions for different occasions When emptying history, set info->state to point to the first history event. storage/maria/ma_state.h: Added _ma_row_visible_xxx() prototypes storage/maria/ma_static.c: Indentation changes storage/maria/ma_statrec.c: Fixed arguments to _ma_dpointer() and _ma_rec_pos() storage/maria/ma_test1.c: Call init_thr_lock() if we have versioning storage/maria/ma_test2.c: Call init_thr_lock() if we have versioning storage/maria/ma_unique.c: Modified functions to use MARIA_KEY storage/maria/ma_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_write.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] In _ma_enlarge_root(), mark in page_flag if new key has transid _ma_dpos() -> _ma_row_pos_from_key() Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not Moved 'reversed' to outside block as area was used later storage/maria/maria_chk.c: Added error if trying to sort with HA_BINARY_PACK_KEY Use new interface to get_key() and _ma_dpointer() _ma_dpos() -> _ma_row_pos_from_key() storage/maria/maria_def.h: Modified functions to use MARIA_KEY instead of key pointer and key length Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning Added create_trid to MARIA_SHARE Removed not used state variables 'process' and 'unique' Added defines for handling TRID's in index pages Changed to use MARIA_SHARE instead of MARIA_HA for some functions Added 'have_versioning' flag if table supports versioning Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF Changed last_key to be of type MARIA_KEY. Removed lastkey_length lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2 Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key Changed 'nextflag' and assocaited variables to uint32 storage/maria/maria_ftdump.c: lastkey -> lastkey_buff storage/maria/trnman.c: Fixed wrong initialization of min_read_from and max_commit_trid Added trnman_get_min_safe_trid() storage/maria/unittest/ma_test_all-t: Added --start-from storage/myisam/mi_check.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_delete.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_range.c: Updated comment storage/myisam/mi_write.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/rt_index.c: Fixed wrong parameter to rtree_get_req() which could cause crash	18 years ago
Jani Tolonen	4f14b87d91	Imported fix for bug#29464 from myisam table handler to maria.	18 years ago
Guilhem Bichot	96e2ca52ad	Fix for failure of test maria-recover under Windows. mysql-test/r/maria-recover.result: result update mysql-test/t/maria-recover.test: making test independent of / or \ in file names (failed under Windows) storage/maria/ma_test_force_start.pl: indentation	18 years ago
Guilhem Bichot	771a66eaee	Port of ma_test_force_start.pl (test program for --maria-force-start-after-recovery-failures) to Windows. storage/maria/ma_test_force_start.pl: port to Windows: detection of where 'mysql' command-line client is (debug/release/etc)), .exe suffix, --console instead of --mem, --P instead of --socket, taskkill instead of perl's kill.	18 years ago
Guilhem Bichot	26f685e72a	disabling lockman2-t: takes too much time for a unit test (>=15 min), and what it tests is not used in Maria, this fixes BUG#34744 "Maria Unit test "lockman2" fails on Mac OS X 10.4 PowerPC 64-bit" storage/maria/unittest/CMakeLists.txt: disabling lockman2-t storage/maria/unittest/Makefile.am: disabling lockman2-t	18 years ago
unknown	abdda9e2d9	More safe flush_horizon variable initialization.	18 years ago
Guilhem Bichot	bbef67f5bd	Fix for BUG#35801 "Maria: unreadable log during tests" and BUG#35823 "Maria: log handler assertion (page[page_offset] & (3 << 6)) == 0x00... fails" Both random problems can be explained by the REDO phase starting from a log horizon which is not a LSN, which is the bug fixed here. storage/maria/ma_recovery.c: In Recovery, REDO phase needs to start log reading from a LSN, not a log horizon: start_address was only guaranteed to be a horizon, not necessarily a LSN. On some machine and test, it happened that start_address was only a log horizon, and run_redo_phase() tried to read from there, and log handler naturally refused that: ma_loghandler.c:6797: translog_read_record_header_from_buffer: Assertion `translog_is_LSN_chunk(page[page_offset])' failed. And in non-debug build, just the "redo phase failed" message in the error log. This was random, because depended on amount of checkpoints which is timing-dependent; also depended on Maria tests ran or skipped (so, debug or non-debug builds)... Bad code was introduced by me end of December so it's likely to explain lots of random log handler errors we observed since.	18 years ago
Guilhem Bichot	8ac71501fc	Fix for BUG#37005 "Maria: ALTER TABLE TRANSACTIONAL=0 leaves table transactional inside Maria" mysql-test/r/maria-page-checksum.result: result for new test portion. Without the code fix, you would see a wrong "yes" or "no" in the "Crashsafe" line for iterations 2,9,14. mysql-test/t/maria-page-checksum.test: Adding test for BUG#37005 "Maria: ALTER TABLE TRANSACTIONAL=0 leaves table transactional inside Maria" sql/sql_table.cc: In ALTER TABLE, we already rebuilt the table entirely if the DEFAULT CHARSET, ROW_FORMAT or PAGE_CHECKSUM clauses were used; we have to do the same if the TRANSACTIONAL clause is used, because it affects the table inside the engine (for example, Maria makes shorter rows in non-transactional tables). Not doing so led to the BUG#37005, where ALTER TABLE TRANSACTIONAL=0 sometimes left the table transactional into Maria though not in the frm.	18 years ago
Guilhem Bichot	8ffd03394a	public commit mails	18 years ago
Guilhem Bichot	5465dd088d	automerge	18 years ago
unknown	7c87c307f3	Fixed non-debug build. storage/maria/ma_loghandler.c: Now we need buffer number to set dirty buffers mask.	18 years ago
Guilhem Bichot	a0aa81f9a8	Fix for BUG#36319 "Maria: table is not empty but DELETE and SELECT find no rows": _ma_scan_block_record() has "while (likely(bits))" where bits is ulonglong, so was cast to long which lost most significant bits (32-bit linux), and test yielded false. include/my_global.h: It's too easy to think that because "if (some_longlong)" works as intended, "if (likely(longlong))" will work too, though it does not. Making likely() cast to bool. mysql-test/r/maria2.result: Result. Before fixing the bug, 810 was 812 and 0 was 812 (DELETE and SELECT found no rows though they were there). mysql-test/t/maria2.test: Testcase for the bug. maria.test is huge now, so starting a second test file instead.	18 years ago
Guilhem Bichot	f89c61f5bb	Fix for Valgrind errors when running rt_test and ma_rt_test, and segmentation fault in ma_rt_test -M (BUG#36321); keyinfo/recinfo/keyseg had non-initialized parts. maria_scan() was not wrapped in maria_scan_init()/end() so "ma_rt_test -M" found no rows. Preparing for inclusion into ma_test_all-t and ma_test_recovery.pl (still prevented by BUG#37307 "Maria: R-tree unit test produces corrupted table"). storage/maria/ma_rt_test.c: Some members of keyinfo, recinfo, keyseg had non-initialized parts, led to Valgrind errors, and also segmentation fault when running with -M (=BLOCK_RECORD) (BUG#36321). We now bzero them like they are in mi_test1. Other problems: - maria_scan() was not wrapped in maria_scan_init()/end() so "ma_rt_test -M" found no rows. - --silent had almost no effect, now it really silences normal output. - Some errors were going to stdout, they now go to stderr. Added option for testing versioning, to fit well into ma_test_all-t. storage/maria/unittest/ma_test_all-t: preparing for running ma_rt_test when ma_rt_test remaining bugs are fixed storage/maria/unittest/ma_test_recovery.pl: preparing for running ma_rt_test when ma_rt_test remaining bugs are fixed storage/myisam/rt_test.c: Some members of keyinfo, recinfo, keyseg were not initialized, led to Valgrind errors. We now bzero them like they are in mi_test1.	18 years ago
unknown	0f660db3aa	merge	18 years ago
unknown	3967b6cfc7	WL#4401 "Maria - deserialize translog_flush() calls" storage/maria/ma_loghandler.c: New flush procedure added. storage/maria/unittest/Makefile.am: Test of many multi-thread flush added storage/maria/unittest/ma_test_loghandler_multithread-t.c: Test of many multi-thread flush added	18 years ago

1 2 3 4 5 ...

54664 Commits (1a5de5bc82cee3c2411862b8ef32588b530a780f) All Branches Search

54664 Commits (1a5de5bc82cee3c2411862b8ef32588b530a780f)

All Branches