scripts/mysql_fix_privilege_tables.sh:
Fix a problem with events table not getting updated correctly.
This happens when you run scripts/mysql_fix_privilege_tables and
you have an old version of mysql_fix_privilege_tables.sql in
the actual installation directory. This patch makes it look for
the file inside the source dir first.
storage/maria/unittest/ma_test_all-t:
Added several new options for ma_test_all-t
--verbose is handy, if you want to run the tests separately on the
screen.
Added functions for counting tests and a possibility to
separate a group of tests inside an array of test.
unittest/Makefile.am:
Fixed a problem with make test not executing
ma_test_all-t properly from the top source dir.
Automaticly disable ma_test_recovery if not compiled with debugging. This fixes that make test works in Maria.
Fixed wrong merge of ma_init.c from 5.1
Portability fixes:
- Use my_chmod() instead of my_chmod()
- Use my_access() instead of my_stat() to test if file exists
- Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable
- No reason to test if file exists before we delete it
include/my_sys.h:
Added my_chmod
include/mysys_err.h:
Added error for my_chmod
mysys/Makefile.am:
Added my_chmod
mysys/errors.c:
Added error for my_chmod
mysys/my_init.c:
Syncronize with 5.1 to fix setting of QueryPerformanceFrequency()
storage/maria/ma_test1.c:
Changed short option of --skip-delete and --skip-update to be more logical
storage/maria/ma_test_recovery.expected:
Updated results after adding more tests
storage/maria/ma_test_recovery:
Abort test nicely if we are runnning without debugging
Added more tests
Changed temporary file names so that one can run maria_chk on them
Removed some old comments
storage/maria/maria_read_log.c:
Added note if maria_read_log will not be able to create byte-to-byte identical tables compared to normal execution
storage/maria/unittest/ma_pagecache_consist.c:
Removed wrong setting of buff that caused memory overwrite
Use my_chmod() instead of chmod()
Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable
storage/maria/unittest/ma_pagecache_single.c:
Use my_chmod() instead of chmod()
Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
No reason to test if file exists before we delete it
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
No reason to test if file exists before we delete it
storage/maria/unittest/ma_test_loghandler_nologs-t.c:
Use my_access() instead of my_stat() to test if file exists
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
No reason to test if file exists before we delete it
chmod -> my_chmod
mysys/my_chmod.c:
Added wrapper for chmod()
Fixed failure in unittest/ma_test_loghandler_pagecache-t
Initialize pagecache callbacks explictily, not with pagecache_init().
This is to make things more readable and for the future to make more choices with callbacks
storage/maria/ha_maria.cc:
Disable logging of index pages during repair
storage/maria/ma_bitmap.c:
Initialize callbacks explictily, not with pagecache_init(), to make things more readable and for future to have more choices with callbacks
Use new interface to flush logs from pagecache
storage/maria/ma_check.c:
Fixed test for wrong keyblocks
Use default functions to setup callbacks for pagecache
storage/maria/ma_loghandler.c:
Use dummy functions for log flush callback (NULL doesn't work anymore)
storage/maria/ma_open.c:
Initialize callbacks explictily, not with pagecache_init(), to make things more readable and for future to have more choices with callbacks
Prefix external functions with _ma_
storage/maria/ma_pagecache.c:
Use new simpler interface to flush logs if needed
storage/maria/ma_pagecache.h:
Changed interface to a faster, simpler one to flush logs.
Now we have a function that takes care of flushing logs, instead of a function to get lsn address
storage/maria/ma_pagecrc.c:
Add functions for flushing logs
storage/maria/ma_recovery.c:
Rename functions
storage/maria/maria_chk.c:
Use default functions to setup callbacks for pagecache
storage/maria/maria_def.h:
Prefixd global functions with _ma_
storage/maria/unittest/ma_pagecache_consist.c:
Use dummy functions for log flush callback (NULL doesn't work anymore)
storage/maria/unittest/ma_pagecache_single.c:
Use dummy functions for log flush callback (NULL doesn't work anymore)
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Use maria_flush_log_for_page to flush log pages. Fixes failure in unittest
mysql-test/include/maria_empty_logs.inc:
At one moment in maria-recovery.test the first log has number 2,
because log 1 was manually deleted.
mysql-test/r/maria-recovery.result:
after-merge fix
mysql-test/t/maria-recovery.test:
after-merge fix
storage/maria/ma_bitmap.c:
after-merge fix. The todo is implemented now.
storage/maria/ma_blockrec.c:
comment
storage/maria/ma_open.c:
after-merge fix. Set write_fail also for index file or a write error
would crash.
storage/maria/ma_pagecache.c:
comment
storage/maria/ma_pagecache.h:
I prefer to use NULL for 'no callback' instead of a dummy callback
in the special case of get_log_address; indeed for non-transactional
tables it uses an if(), while if using a dummy callback, it would
use a function call plus an if() (the dummy callback would need to
return a magic value to say "don't flush" and that value would be
tested in if()).
storage/maria/unittest/ma_test_all-t:
fix if running from outside storage/maria
into gbichot4.local:/home/mysql_src/mysql-maria-for-undo-phase
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_recovery.c:
Auto merged
mysql-test/r/maria-recovery.result:
merge
mysql-test/t/maria-recovery.test:
merge
This is used to bzero all not used parts of the index pages and compact and bzero the not used parts of the data pages of block-record type
Added --zerofill (-z) option to maria_chk (Mostly code from Jani)
Added now table states ZEROFILLED and MOVEABLE
Set state.changed with new states when things changes
include/maria.h:
Added maria_zerofill
include/myisamchk.h:
Added option for zerofill
Extend testflag to be 64 to allow for more flags
mysql-test/r/create.result:
Updated results after merge
mysql-test/r/maria.result:
Updated results after merge
mysys/my_getopt.c:
Removed not used variable
sql/sql_show.cc:
Fixed wrong page type
storage/maria/ma_blockrec.c:
Renamed compact_page() to ma_compact_block_page() and made it global
Always zerofill half filled blob pages
Set share.state.changed on REDO
storage/maria/ma_blockrec.h:
Added _ma_compact_block_page()
storage/maria/ma_check.c:
Added maria_zerofill()
This is used to bzero all not used parts of the index pages and compact and bzero the not used parts of the data pages of block-record type
This gives the following benefits:
- Table is smaller if compressed
- All LSN are removed for transactinal tables and this makes them movable between systems
Dont set table states of we are using --quick
Changed log entry for repair to use 8 bytes for flag
storage/maria/ma_delete.c:
Simplify code
Update state.changed
storage/maria/ma_key_recover.c:
Update state.changed
storage/maria/ma_locking.c:
Set uuid for file on first change if it's not set (table was cleared with zerofill)
storage/maria/ma_loghandler.c:
Updated log entry for REDO_REPAIR_TABLE
storage/maria/ma_recovery.c:
Updated log entry for REDO_REPAIR_TABLE (flag is now 8 bytes)
Set new bits in state.changed
storage/maria/ma_test_all.sh:
Nicer output
storage/maria/ma_test_recovery.expected:
Updated results (now states flags are visible)
storage/maria/ma_update.c:
Update state.changed
storage/maria/ma_write.c:
Simplify code
Set state.changed
storage/maria/maria_chk.c:
Added option --zerofill
Added printing of states for MOVABLE and ZEROFILLED
MYD -> MAD
MYI -> MAI
storage/maria/maria_def.h:
Added states STATE_NOT_MOVABLE and STATE_NOT_ZEROFILLED
Added prototype for new functions
storage/maria/unittest/ma_test_all-t:
More tests, including tests for zerofill
Removed some not needed 'print' statements
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Smaller buffer to not trash devlopment machines totally
mysql-test/include/maria_empty_logs.inc:
can now ask that control file be preserved
mysql-test/lib/mtr_report.pl:
expected warning (produced by translog_init() when log is missing)
mysql-test/r/maria-recovery.result:
result update
mysql-test/t/maria-recovery.test:
test of removing logs manually; recovery used to fail
storage/maria/ma_loghandler.c:
The addition to maria-recovery.test uncovered a bug: log 1 was
manually deleted, Maria restarted, created log 2, then crash
before a checkpoint: logs_found is TRUE, last_checkpoint_lsn
is LSN_IMPOSSIBLE, so sure_page assumes that log 1 exists;
using last_logno instead (only the last log needs to be checked,
as the 'else' branch checks only after last_checkpoint_lsn:
creation of a log is as good a starting point as a checkpoint,
for scanning the log).
must be updated correctly. And Recovery should not assume that
log 1 is available but just use first available log.
mysql-test/r/maria-purge.result:
result update
mysql-test/t/maria-purge.test:
like in other Maria tests (4294967296 is too big, causes warning)
storage/maria/ma_loghandler.c:
When log handler starts and discovers that logs are missing though
control file says they should be there (they have been manually
deleted), it decides to create a log
with number last_logno+1. It needs to update control file with
this new number, and also reset last_checkpoint_lsn to LSN_IMPOSSIBLE
(last checkpoint went away when log was deleted).
Fix for when translog_init() fails before allocating id_to_share
(translog_destroy() tried to free NULL).
storage/maria/ma_recovery.c:
When logs have been manually deleted, translog_first_theoretical_lsn()
always fails (it looks for log number 1). Recovery now uses
translog_first_lsn_in_log() which just picks the first available log.
into mysql.com:/home/my/mysql-maria
dbug/dbug.c:
Auto merged
include/my_dbug.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/maria-recovery.result:
Auto merged
mysql-test/t/maria-recovery.test:
Auto merged
mysql-test/t/maria.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/maria/Makefile.am:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_key_recover.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_recovery.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/ma_test_all.sh:
Use remote version
mysql-test/r/maria.result:
Trivial merge
storage/maria/ma_pagecache.c:
Trivial merge
Added variable _dbug_on_ to speed up execution when DBUG is not going to be used
Added --debug-on option to mysqld (to be able to turn of DBUG with --debug-on=0)
Fixed some bugs with 'non_flushable' marking of bitmap pages
Don't use 'non_flushable' marking of bitmap pages for not transactional tables
SHOW CREATE TABLE now shows if table was created with page checksums
Fixed a lot of bugs with BLOB handling in case of update/REDO and UNDO
More tests (especially for blobs) and DBUG_ASSERTS()
More readable output from maria_read_log and maria_chk
Fixed wrong shift that caused Maria to crash on files > 4G
Mark tables as crashed of REDO fails
dbug/dbug.c:
Changed to use my_bool (allowed me to remove some windows specific code)
Added variable _dbug_on_ to speed up execution when DBUG is not going to be used
Removed initialization of variables if not needed
include/my_dbug.h:
Use my_bool for some functions that was defined as BOOLEAN in dbug.c code
Added DBUGGER_ON/DEBUGGER_OFF to speed up execution when DBUG is not used
include/my_global.h:
Define my_bool early
Increase MY_HOW_OFTEN_TO_WRITE as computers are now faster than 10 years ago
mysql-test/mysql-test-run.pl:
Added debug-on=0 to speed up tests
mysql-test/r/maria-recovery.result:
Added new test by Guilhem to test if UNDO_ROW_DELETE preserves rowid
mysql-test/r/maria.result:
Added testing of page checksums
mysql-test/t/crash_commit_before-master.opt:
Added --debug-on as test require DBUG to work
mysql-test/t/maria-recovery-bitmap-master.opt:
Added --debug-on as test require DBUG to work
mysql-test/t/maria-recovery-master.opt:
Added --debug-on as test require DBUG to work
mysql-test/t/maria-recovery.test:
Added new test by Guilhem to test if UNDO_ROW_DELETE preserves rowid
mysql-test/t/maria.test:
Added testing of page checksums
sql/mysqld.cc:
Added --debug-on option (to be able to turn of DBUG with --debug-on=0)
Indentation fixes
Removed end spaces
sql/sql_show.cc:
Allow update_create_info() to inform MySQL if PACK_KEYS, NO_PACK_KEYS, CHECKSUM, PAGE_CHECKSUM or DELAY_KEY_WRITE is used
storage/maria/Makefile.am:
Added ma_test_big.sh
storage/maria/ha_maria.cc:
Store in create_info if page checksums are used (For SHOW CREATE TABLE)
storage/maria/ma_bitmap.c:
Added _ma_bitmap_wait_or_flush() to cause reader of bitmap pages to wait with reading until bitmap is flushed.
Use TAIL_PAGE_COUNT_MARKER for tail pages
Set 'sub_blocks' for and only for the head page or for the first extent of a blob. This is needed for store_extent_info() to be able to set START_EXTENT_BIT's
Don't allocate more than 0x3ffff pages in one extent (We need bit 0x4000 as a START_EXTENT_BIT)
Increase the calculated 'head_length' with the number of bytes used for extents.
Update row->space_on_head_page also in _ma_bitmap_find_new_place()
Make _ma_bitmap_get_page_bits() global. (Needed for UNDO handling)
Changed _ma_bitmap_flushable() to take MARIA_HA instead of MARIA_SHARE.
This was needed to be able to mark the handler if we had a 'non_flushable' call pending or not.
Don't use 'non_flushable' marking of bitmap pages for not transactional tables.
Added BLOCKUSED_USE_ORG_BITMAP handling also for tail pages.
Added more DBUG_ASSERT() to find possible errors in other code
Some code simplications by adding new local variables
storage/maria/ma_blockrec.c:
UNDO of rows now puts back all part of the row on their original pages and positions.
Changed UNDO of DELETE and UNDO of UPDATE to contain information about the original length of data on head block and also extent information
This changes a lot of logic as now an insert of a row on a page may happen to any position (and not just to the first or next free)
Use PAGE_COUNT to mark if an extent is the start of of a blob. (Needed for extent_to_bitmap_blocks())
Added check_directory() for checking that directroy entries are correct.
Added checking of row checksums when reading rows (with EXTRA_DEBUG)
Added make_space_for_directory() and extend_directory() for doing expansion of directory
Added get_rowpos_in_head_or_tail_page() to be able to store head/tail on original position in UNDO
Added extent_to_bitmap_blocks() to be able to generate original bitmap blocks from UNDO entry
Added _ma_update_at_original_place() for UNDO of DELETES
Added row->min_length to hold minmum required space needed on head page
Changed find_free_position() to use make_space_for_directory()
Changed make_empty_page() to allow optional creation of directory entry
Changed delete_head_or_tail() and _ma_apply_undo_row_isnert() to not copy pagecache block (speed optimization)
Changed _ma_apply_redo_insert_row_head_or_tail() to be able to insert new row at any position on 'new' page
Changed _ma_apply_undo_row_delete() and _ma_apply_undo_row_update() to put row in it's original position
Ensure allocation of tail blocks are of at least MIN_TAIL_SIZE.
Ensure we store pages in pinned pages even if read failed. (If not we will have pages pinned forever in page cache)
Write original extent information in UNDO entry, not compacted ones (we need position to tails!)
When setting BLOCKUSED_USED, don't clear other bits (we have to preserve BLOCKUSED_USE_ORG_BITMAP)
Fixed som bugs in directory handling
Fixed bug where we wrote wrong lsn to blob pages
Added separate blob_buffer for fixing bug when updating row that had char/varchar that spanned several pages and also had blobs
Ensure we call _ma_bitmap_flushable() also in case of errors
When doing an update, first delete old entries, then search in bitmap for where to put new information
Info->s -> share
Rowid -> rowid
More DBUG_ASSERT()
storage/maria/ma_blockrec.h:
Added START_EXTENT_BIT and TAIL_PAGE_COUNT_MARKER
Added _ma_bitmap_wait_or_flush() and _ma_bitmap_get_page_bits()
storage/maria/ma_check.c:
Don't write extra empty line if there is no deleted blocks
Ignore START_EXTENT_BIT's in page count
Call _ma_fast_unlock_key_del() to free key_del link
storage/maria/ma_close.c:
Ensure that used_key_del is 0. (If not, someone forgot to call _ma_unlock_key_del())
storage/maria/ma_create.c:
Changed constant to macro
storage/maria/ma_delete.c:
For deleted keys, log also position to row
storage/maria/ma_extra.c:
Release blob buffer at maria_reset() if bigger than MARIA_SMALL_BLOB_BUFFER
storage/maria/ma_key_recover.c:
Added bzero() of LSN that confused paged cache in case of uninitialized block
Mark file crashed if applying of index changes fails
Added calls to _ma_fast_unlock_key_del() for protection of shared key_del link.
storage/maria/ma_locking.c:
Added usage of MARIA_FILE_OPEN_COUNT_OFFSET
Added _ma_mark_file_crashed()
storage/maria/ma_loghandler.c:
Fixed bug where we logged uninitialized memory
storage/maria/ma_open.c:
Moved state->changed to be at start of state info on disk to allow one to easly mark files as crashed
storage/maria/ma_page.c:
Disable 'dummy' checksumming of pages as this gave false warnings.
(Need to investigate if this is ever needed)
storage/maria/ma_pagecache.c:
Fixed wrong shift that caused Maria to crash on files > 4G
storage/maria/ma_recovery.c:
In case of errors, start writing on new line if we where in %## %## printing mode (Made errors more readable)
Changed global variable name from warnings -> recovery_warnings
Use MARIA_FILE_CREATE_RENAME_LSN_OFFSET instead of constant
Removed special handling of row position for deleted keys. Keys now always includes row positions
_ma_apply_undo_row_delete() now gets page and row position
Added check that we don't loop forever when handling undo's (in case of bug in undo chain)
Print name of failed REDO/UNDO
storage/maria/ma_recovery.h:
Removed old comment
storage/maria/ma_static.c:
Chaned version number of Maria files to not accidently use old ones (becasue of change of ordering of status variables)
storage/maria/ma_test2.c:
Added option -u to specify number of rows to update
Changed old option -u to be -A, as for ma_test1
Fixed bug in update of rows with blobs (before blobs was always reset to empty on update)
First created blob is now of max blob length to ensure we have at least one big blob in the table
storage/maria/ma_test_all.sh:
More tests
storage/maria/ma_test_recovery.expected:
Updated results
storage/maria/ma_test_recovery:
Changed tests to use bigger blobs (not just 1K)
Added new tests that tests recovery of update with blobs
Removed comparision of .MAD file as it's not guranteed that recovery from scratch gives identical data file as original update
(compact_page() may be called at different times during normal execution and during REDO)
storage/maria/ma_update.c:
Simplify code (changed * to if)
storage/maria/maria_chk.c:
Make output more readable
storage/maria/maria_def.h:
Changed 'changed' to int to prepare for more bits
Added 2 more bytes to status information
Added 'st_mara_row->min_length' for storing min length needed on head page
Added 'st_mara_handler->blob_buff & blob_buff_size' for storing blobs
Moved all tunning parameters into one block
Added MARIA_SMALL_BLOB_BUFFER
Added _ma_mark_file_crashed()
storage/myisam/mi_test2.c:
Fixed bug in update of rows with blobs (before blobs was always reset to empty on update)
storage/maria/ma_test_big.sh:
Testing of insert, update, delete, recovery and undo of rows with blobs
Thanks to the random-ness of ma_test2 this is likely to find most bugs in the row handling
* to honour WAL we now force the whole log when flushing a bitmap page.
* ability to intentionally crash in various places for recovery testing
* bugfix (dirty pages list found in checkpoint record was ignored)
* smaller checkpoint record
* misc small cleanups and comments
mysql-test/include/maria_empty_logs.inc:
maria-purge.test creates ~11 logs, remove them all
mysql-test/r/maria-recovery-bitmap.result:
result is good; without the _ma_bitmap_get_log_address() call,
we got
check error Bitmap at 0 has pages reserved outside of data file length
mysql-test/r/maria-recovery.result:
result update
mysql-test/t/maria-recovery-bitmap.test:
enable test of "bitmap-flush should flush whole log otherwise
corrupted data file (bitmap ahead of data pages)".
mysql-test/t/maria-recovery.test:
test of checkpoint
sql/sql_table.cc:
comment
storage/maria/ha_maria.cc:
_ma_reenable_logging_for_table() now includes file->trn=0.
At the end of repair() we don't need to re-enable logging, it is
done already by caller (like copy_data_between_tables()); it sounds
strange that this function could decide to re-enable, it should be
up to caller who knows what other operations it plans. Removing this
line led to assertion failure in maria_lock_database(F_UNLCK), fixed
by removing the assertion: maria_lock_database()
is here called in a context where F_UNLCK does not make the
table visible to others so assertion is excessive, and external_lock()
is already designed to honour the asserted condition.
Ability to crash at the end of bulk insert when indices
have been enabled.
storage/maria/ma_bitmap.c:
Better use pagecache_file_init() than set pagecache callbacks directly;
and a new function to set those callbacks for bitmap so that we can
reuse it.
_ma_bitmap_get_log_address() is a pagecache get_log_address callback
which causes the whole log to be flushed when a bitmap page
is flushed by the page cache. This was required by WAL.
storage/maria/ma_blockrec.c:
get_log_address pagecache callback for data (non bitmap) pages:
just reads the LSN from the page's content, like was hard-coded
before in ma_pagecache.c.
storage/maria/ma_blockrec.h:
functions which need to be exported
storage/maria/ma_check.c:
create_new_data_handle() can be static.
Ability to crash after rebuilding the index in OPTIMIZE,
in REPAIR. my_lock() implemented already.
storage/maria/ma_checkpoint.c:
As MARIA_SHARE* is now accessible to pagecache_collect_changed_blocks_LSN(),
we don't need to store kfile/dfile descriptors in checkpoint record,
2-byte-id of the table plus one byte to say if this is data or index
file is enough. So we go from 4+4 bytes per table down to 2+1.
storage/maria/ma_commit.c:
removing duplicate functions (see _ma_tmp_disable_logging_for_table())
storage/maria/ma_extra.c:
Monty fixed
storage/maria/ma_key_recover.c:
comment
storage/maria/ma_locking.c:
Sometimes other code does funny things with maria_lock_database(),
like ha_maria::repair() calling it at start and end without going
through ha_maria::external_lock(). So it happens that maria_lock_database()
is called with now_transactional!=born_transactional.
storage/maria/ma_loghandler.c:
update to new prototype
storage/maria/ma_open.c:
set_data|index_pagecache_callbacks() need to be exported as
they are now called when disabling/enabling transactionality.
storage/maria/ma_pagecache.c:
Removing PAGE_LSN_OFFSET, as much of the code relies on it being
0 anyway (let's not give impression we can just change this constant).
When flushing a page to disk, call the get_log_address callback to
know up to which LSN the log should be flushed.
As we now can access MARIA_SHARE* we can know share->id and store
it into the checkpoint record; we thus go from 4 bytes per dirty page
to 2+1.
storage/maria/ma_pagecache.h:
get_log_address callback
storage/maria/ma_panic.c:
No reason to reset pagecache callbacks in HA_PANIC_READ:
all we do is reopen files if they were closed; callbacks should
be in place already as 'info' exists; we just want to modify
the file descriptors, not the full PAGECACHE_FILE structure.
If we open data file and it was closed, share->bitmap.file needs
to be set.
Note that the modified code is disabled anyway.
storage/maria/ma_recovery.c:
Checkpoint record does not contain kfile/dfile descriptors anymore
so code can be simplified. Hash key in all_dirty_pages is
not made from file_descriptor & pageno anymore, but
index_or_data & table-short-id & pageno.
If a table's create_rename_lsn is higher than record's LSN,
we skip the table and don't fail if it's corrupted (because the LSNs
say that we don't have to look at this table).
If a table is skipped (for example due to create_rename_lsn),
its UNDOs still cause undo_lsn to advance; this is so that if later
we notice the transaction has to rollback we fail (as table should
not be skipped in this case).
Fixing a bug: the dirty_pages list was never used, because
the LSN below which it was used was the minimum rec_lsn of dirty pages!
It is now the min(checkpoint_start_log_horizon, min(trn's rec_lsn)).
When we disable/reenable transactionality, we modify pagecache
callbacks (needed for example for get_log_address: changing
share->page_type is not enough anymore).
storage/maria/ma_write.c:
'records' and 'checksum' are protected: they are updated under
log's mutex in write-hooks when UNDO is written.
storage/maria/maria_chk.c:
remove use of duplicate functions.
storage/maria/maria_def.h:
set_data|index_pagecache_callbacks() need to be exported;
_ma_reenable_logging_for_table() changes to a real function.
storage/maria/unittest/ma_pagecache_consist.c:
new prototype
storage/maria/unittest/ma_pagecache_single.c:
new prototype
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
new prototype
include/mysql/plugin.h:
move declarations after merge
mysql-test/r/change_user.result:
more tests
mysql-test/t/change_user.test:
more tests
mysys/my_getopt.c:
remove wrong code
BitKeeper/etc/ignore:
Added libmysqld/sql_profile.cc to the ignore list
- Merge fixes
- "make test" for maria
- Replaced ma_test_all with a perl version,
which now can be run in unittest mode.
include/my_sys.h:
Added clean up function for my_uuid()
mysql-test/r/create.result:
Fixed result file.
mysql-test/r/maria-big.result:
Changed not to get a warning.
mysql-test/r/maria-connect.result:
Not to get a warning.
mysql-test/r/maria-recovery.result:
Not to get a warning.
mysql-test/r/maria.result:
Fixed result file. Added test for warning on log file.
mysql-test/r/ps_maria.result:
Fixed result file. New bit was added to source.
mysql-test/t/maria-big.test:
To avoid a warning.
mysql-test/t/maria-connect.test:
To avoid a warning.
mysql-test/t/maria-recovery.test:
To avoid a warning.
mysql-test/t/maria.test:
To avoid a warning.
mysql-test/t/ps_maria.test:
To avoid a warning.
mysys/my_uuid.c:
Added clean up function for my_uuid()
sql/mysqld.cc:
Manual merge.
storage/maria/Makefile.am:
Added "make test" for maria.
storage/maria/ma_key_recover.c:
Fix for maria_recovery
storage/maria/ma_test_all.sh:
Deprecated file. Functionality moved to
unittest/ma_test_all-t
BitKeeper/deleted/.del-unit.pl:
BitKeeper file /home/my/mysql-maria/storage/maria/unit.pl
into hynda.mysql.fi:/home/my/mysql-maria
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/binlog_unsafe.result:
Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Auto merged
mysys/my_write.c:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
include/my_base.h:
Manual merge. New error code.
into mysql.com:/home/my/mysql-maria
include/my_base.h:
Auto merged
mysql-test/r/maria.result:
Auto merged
sql/handler.h:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
- Ignore CRC errors in REDO for potential new pages
- Ignore CRC errors when repairing tables
- Don't do readcheck callback on read error
- Set my_errno to HA_ERR_WRONG_CRC if we find page with wrong CRC
- Check index page for length before calculating CRC to catch bad pages
Fixed bugs where we used wrong file descriptor to read/write bitmaps
Fixed wrong hash key in 'files_in_flush'
Fixed wrong lock method when writing bitmap
Fixed some wrong printf statements in check/repair that caused core dumps
Fixed argument to translog_page_validator that cause reading of log files to fail
Store number of bytes used for delete-linked key pages to be able to use standard index CRC for deleted key pages.
Use fast 'dummy' pagecheck callbacks for temporary tables
Don't die silently if flush finds pinned pages
Give error (for now) if one tries to create a transactional table with fulltext or spatial keys
Removed some not needed calls to pagecache_file_init()
Added checking of pagecache checksums to ma_test1 and ma_test2
More DBUG
Fixed some DBUG_PRINT to be in line with rest of the code
include/my_base.h:
Added HA_ERR_INTERNAL_ERROR (used for flush with pinned pages) and HA_ERR_WRONG_CRC
mysql-test/r/binlog_unsafe.result:
Added missing DROP VIEW statement
mysql-test/r/maria.result:
Added TRANSACTIONAL=0 when testing with fulltext keys
Added test that verifies we can't yet create transactional test with fulltext or spatial keys
mysql-test/r/ps_maria.result:
Added TRANSACTIONAL=0 when testing with fulltext keys
mysql-test/t/binlog_unsafe.test:
Added missing DROP VIEW statement
mysql-test/t/maria.test:
Added TRANSACTIONAL=0 when testing with fulltext keys
Added test that verifies we can't yet create transactional test with fulltext or spatial keys
mysql-test/t/ps_maria.test:
Added TRANSACTIONAL=0 when testing with fulltext keys
mysys/my_fopen.c:
Fd: -> fd:
mysys/my_handler.c:
Added new error messages
mysys/my_lock.c:
Fd: -> fd:
mysys/my_pread.c:
Fd: -> fd:
mysys/my_read.c:
Fd: -> fd:
mysys/my_seek.c:
Fd: -> fd:
mysys/my_sync.c:
Fd: -> fd:
mysys/my_write.c:
Fd: -> fd:
sql/mysqld.cc:
Fixed wrong argument to my_uuid_init()
sql/sql_plugin.cc:
Unified DBUG_PRINT (for convert-dbug-for-diff)
storage/maria/ma_bitmap.c:
Fixed wrong lock method when writing bitmap
Fixed valgrind error
Use fast 'dummy' pagecheck callbacks for temporary tables
Faster bitmap handling for non transational tables
storage/maria/ma_blockrec.c:
Fixed that bitmap reading is done with the correct filehandle
Handle reading of pages with wrong CRC when page contect doesn't matter
Use the page buffer also when we get WRONG CRC or FILE_TOO_SHORT. (Faster and fixed a couple of bugs)
storage/maria/ma_check.c:
Split long strings for readablity
Fixed some wrong printf statements that caused core dumps
Use bitmap.file for bitmaps
Ignore pages with wrong CRC
storage/maria/ma_close.c:
More DBUG_PRINT
storage/maria/ma_create.c:
Give error (for now) if one tries to create a crash safe table with fulltext or spatial keys
storage/maria/ma_key_recover.c:
Ignore HA_ERR_WRONG_CRC for new pages
info->s -> share
Store number of bytes used for delete-linked key pages to be able to use standard index CRC for deleted key pages.
storage/maria/ma_loghandler.c:
Fixed argument to translog_page_validator()
storage/maria/ma_open.c:
Removed old VMS specific code
Added function to setup pagecache callbacks
Moved code around to set 'share->temporary' early
Removed some not needed calls to pagecache_file_init()
storage/maria/ma_page.c:
Store number of bytes used for delete-linked key pages to be able to use standard index CRC for deleted key pages.
storage/maria/ma_pagecache.c:
Don't do readcheck callback on read error
Reset PCBLOCK_ERROR in pagecache_unlock_by_link() if we write page
Set my_errno to HA_ER_INTERNAL_ERROR if flush() finds pinned pages
Don't die silently if flush finds pinned pages.
Use correct file descriptor when flushing pages
Fixed wrong hash key in 'files_in_flush'; This must be the file descriptor, not the PAGECACHE_FILE as there may be several PAGECACHE_FILE for same file descriptor
More DBUG_PRINT
storage/maria/ma_pagecrc.c:
Removed inline from not tiny static function
Set my_errno to HA_ERR_WRONG_CRC if we find page with wrong CRC
(Otherwise my_errno may be 0, and a lot of other code will be confused)
CRCerror -> error (to keep code uniform)
Print crc with %lu, as in my_checksum()
uchar* -> uchar *
Check index page for length before calculating CRC to catch bad pages
Added 'dummy' crc_check and filler functions that are used for temporary tables
storage/maria/ma_recovery.c:
More DBUG
More message to users to give information what phase failed
Better error message if recovery failed
storage/maria/ma_test1.c:
Added checking of page checksums (combined with 'c' to not have to add more test runs)
storage/maria/ma_test2.c:
Added checking of page checksums (combined with 'c' to not have to add more test runs)
storage/maria/maria_chk.c:
Fixed wrong argument to _ma_check_print_error()
storage/maria/maria_def.h:
Added format information to _ma_check_print_xxxx functions
uchar* -> uchar *
into mysql.com:/home/my/mysql-maria
mysql-test/r/maria-recovery.result:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_blockrec.h:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_key_recover.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_recovery.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
Maria is now used for internal temporary tables in MySQL
Better usage of VARCHAR and long strings in temporary tables
Use packed fields if BLOCK_RECORD is used
null_bytes are not anymore stored in a separate field
New interface to remember and restore scan position
Fixed bugs in unique handling
Don't sync Maria temporary tables
Lock control file while it's used to stop several processes from using it
Changed value of MA_DONT_OVERWRITE_FILE as it collided with MY_SYNC_DIR
Split MY_DONT_WAIT into MY_NO_WAIT and MY_SHORT_WAIT (for my_lock())
Added MY_FORCE_LOCK
include/my_sys.h:
Changed value of MA_DONT_OVERWRITE_FILE as it collided with MY_SYNC_DIR
Split MY_DONT_WAIT into MY_NO_WAIT and MY_SHORT_WAIT (for my_lock())
Added MY_FORCE_LOCK
include/myisam.h:
Make MyISAM columndef compile time compatible with Maria
mysql-test/lib/mtr_process.pl:
Removed confusing warning (It's common that there is a lot of other files than pid files)
mysql-test/mysql-test-run.pl:
Added --sync-frm to speed up tests
mysql-test/r/maria-recovery.result:
Updated results from wrong push
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Marked test as --big
mysys/my_lock.c:
If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
If MY_NO_WAIT is given, return at once if lock is occupied
If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)
mysys/my_thr_init.c:
Fix that we don't give name to thread before it's properly initied
sql/handler.cc:
Added myisam.h
sql/handler.h:
Changes to use Maria for internal temporary tables
Removed not needed argument to restart_rnd_next()
Added function remember_rnd_pos()
sql/my_lock.c:
If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
If MY_NO_WAIT is given, return at once if lock is occupied
If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)
sql/mysql_priv.h:
Added maria_hton
sql/sql_class.h:
Changes to use Maria for internal temporary tables
sql/sql_select.cc:
Changes to use Maria for internal temporary tables
Temporary tables didn't properly switch to dynamic row format if long strings was used
Better usage of VARCHAR in temporary tables
Use new interface to restart scan in duplicate removal
sql/sql_select.h:
Changes to use Maria for internal temporary tables
sql/sql_show.cc:
Changes to use Maria for internal temporary tables
Removed all end space
sql/sql_table.cc:
Set HA_OPTION_PACK_RECORD if we are not using default or static record
sql/sql_union.cc:
If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
If MY_NO_WAIT is given, return at once if lock is occupied
If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)
sql/sql_update.cc:
If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
If MY_NO_WAIT is given, return at once if lock is occupied
If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)
storage/maria/ha_maria.cc:
Use packed fields
null_bytes are not anymore stored in a separate field
Changes to use Maria for internal temporary tables
Give warning if we try to do an ALTER TABLE to a unusable row format
storage/maria/ha_maria.h:
Allow Maria with block format to restart scanning at given position
storage/maria/ma_blockrec.c:
Added functions to remember and restore scan position
Allocate cur_row.extents so that we don't have to do a malloc on first read
Fixed bug when using packed row without packed strings
Removed unneeded calls to free_full_pages()
Fixed unlikely bug when using old bitmap to read head page and head page had gone away
Remember row position when doing undo of delete and update row (needed for undo of key delete)
storage/maria/ma_blockrec.h:
Added functions to remember and restore scan position
storage/maria/ma_close.c:
Don't sync temporary tables
storage/maria/ma_control_file.c:
Lock control file while it's used to stop several processes from using it
storage/maria/ma_create.c:
Fixed bug when using FIELD_NORMAL that was longer than FULL_PAGE_SIZE
Fixed bug that casued fields to not be ordered according to offset
Fixed bug in unique creation
storage/maria/ma_delete.c:
Don't write record reference when deleting key.
(Rowid is likely to be different when we undo this)
storage/maria/ma_dynrec.c:
Fixed core dump when comparing records (happended in unique handling)
storage/maria/ma_extra.c:
MY_DONT_WAIT -> MY_SHORT_WAIT
Removed TODO comment. (Was not relevant as all other instances are guranteed to be closed when we the code is excecuted)
Added DBUG_ASSERT() to prove above.
storage/maria/ma_key_recover.c:
CLR's for UNDO_ROW_DELETE and UNDO_ROW_UPDATE now include rowid for the row.
This was needed for undo_key_delete to work, as undo of delete row is likely to put row in a new position.
undo_delete_key now doesn't include row position
storage/maria/ma_open.c:
Added virtual functions for remembering and restoring scan position
Fixed wrong key search method when using multi-byte character sets (Bug#32705)
Store original column number in index file
NOTE: Index files are now incompatible with previous versions!
(Ok as we haven't yet made a public Maria release)
storage/maria/ma_recovery.c:
Set info->cur_row.lastpos when reading CLR's for UNDO_ROW_DELETE or UNDO_ROW_UPDATE
storage/maria/ma_scan.c:
Added default function to remember and restore scan position
storage/maria/maria_def.h:
Added virtual functions & variables to remember and restore scan position
Added MARIA_MAX_CONTROL_FILE_LOCK_RETRY
storage/myisam/ha_myisam.cc:
Fixed compiler errors as columdef->type is now an enum, not an integer
Added functions to remember and restore scan position
storage/myisam/ha_myisam.h:
Added functions to remember and restore scan position
storage/myisam/mi_check.c:
MY_DONT_WAIT -> MY_SHORT_WAIT
storage/myisam/mi_extra.c:
MY_DONT_WAIT -> MY_SHORT_WAIT
storage/myisam/mi_open.c:
MY_DONT_WAIT -> MY_SHORT_WAIT
storage/myisam/myisamdef.h:
MY_DONT_WAIT -> MY_SHORT_WAIT
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.new
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
into desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-callback
storage/maria/Makefile.am:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_loghandler.h:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_page.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/unittest/ma_test_loghandler-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_purge-t.c:
Auto merged
storage/maria/ma_bitmap.c:
Merge.
storage/maria/ma_loghandler.c:
Merge.
storage/maria/unittest/Makefile.am:
Merge.
storage/maria/ma_loghandler.c:
Postmerge fix.
New state of the log added to proicess correctly shutdown.
storage/maria/ma_loghandler.h:
New state of the log added to proicess correctly shutdown.
into desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-readonly
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_test1.c:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/unittest/ma_test_loghandler-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Auto merged
storage/maria/unittest/ma_test_loghandler_purge-t.c:
Auto merged
storage/maria/ma_check.c:
Merge.
storage/maria/ma_loghandler.c:
Merge.
storage/maria/ma_loghandler.h:
Merge.
storage/maria/maria_read_log.c:
Merge.
storage/maria/unittest/Makefile.am:
Merge.
error fixed (switching to the read only mode).
Added read only mode of transactions log handler.
storage/maria/ha_maria.cc:
Transaction log initialization parameters change.
storage/maria/ma_check.c:
New status variable of transactional log.
storage/maria/ma_create.c:
New status variable of transactional log.
storage/maria/ma_loghandler.c:
- New status variable added.
- Checking the status variable in the loghandler
interface functions added
- All fails of loghandler functions revised.
- UNRECOVERABLE_ERROR() removed.
- Switching to read only mode added where it nead.
- Checking of log state added before writes log content
and changing status variables like sent_to_file, n_buffers_only, flushed.
- Readonly loghandler initialization added.
- Fixed problem with example table transactional log initialization.
storage/maria/ma_loghandler.h:
Readonly loghandler initialization added.
Fixed problem with example table transactional log initialization.
New status variable added.
storage/maria/ma_open.c:
New status variable of transactional log.
storage/maria/ma_test1.c:
Transaction log initialization parameters change.
storage/maria/ma_test2.c:
Transaction log initialization parameters change.
storage/maria/maria_read_log.c:
Transaction loghandler initialization in read only mode in
case of only dysplay parameter.
storage/maria/unittest/Makefile.am:
Test of readonly mode added.
storage/maria/unittest/ma_test_loghandler-t.c:
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
Fixed incorrect fprintf call parameters.
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
Useing this test also as read only loghandler test.
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
storage/maria/unittest/ma_test_loghandler_purge-t.c:
Transaction log initialization parameters change.
Fixed problem with example table transactional log initialization.
Updates to the bitmap flush/pin logic to prepare for when we support
multiple writers.
storage/maria/ma_bitmap.c:
Read lock is less bad than write lock.
Changing bitmap->flushable to a counter, to prepare for when multiple
writers are allowed on a table.
Using bitmap->flush_all_requested instead of share->in_checkpoint; the
latter can be true for the time of a whole checkpoint even though
the checkpoint is not yet handling our table, or has already handled it,
so to decrease the number of broadcasts we use a dedicated my_bool
which is true only when checkpoint is handling this table's bitmap.
_ma_bitmap_flushable(share,+1) waits for a concurrent _ma_bitmap_flush_all()
to finish before incrementing non_flushable; without this, with multiple
writers there may always be one thread making the bitmap unflushable
and thus checkpoint would stall.
storage/maria/ma_blockrec.c:
update to new prototype: "flushable is FALSE|TRUE" becomes "add 1|-1 to
non_flushable".
storage/maria/ma_blockrec.h:
new prototype
storage/maria/maria_def.h:
MARIA_FILE_BITMAP::flushable becomes a counter.
New MARIA_FILE_BITMAP::flush_all_requested.
include/my_atomic.h:
transparent_union doesn't work in g++, doesn't work on darwin/ppc64
storage/maria/ma_blockrec.c:
compiler warning
storage/maria/ma_loghandler.c:
compiler warning
storage/maria/ma_page.c:
compiler warning
* fix for bitmap vs checkpoint bug which could lead to corrupted
tables in case of crashes at certain moments: a bitmap could be flushed
to disk even though it was inconsistent with the log (it could be
flushed before REDO-UNDO are written to the log). One bug remains, need
code from others. Tests added. Fix is to pin unflushable bitmap pages,
and let checkpoint wait for them to be flushable.
* fix for long_trid!=0 assertion failure at Recovery.
* less useless wakeups in the background flush|checkpoint thread.
* store global_trid_generator in checkpoint record.
mysql-test/r/maria-recovery.result:
result update
mysql-test/t/maria-recovery.test:
make it easier to locate subtests
storage/maria/ma_bitmap.c:
When we send a bitmap to the pagecache, if this bitmap is not in a
flushable state we keep it pinned and add it to a list, it will be
unpinned when the bitmap is flushable again.
A new function _ma_bitmap_flush_all() used by checkpoint.
A new function _ma_bitmap_flushable() used by block format to signal
when it starts modifying a bitmap and when it is done with it.
storage/maria/ma_blockrec.c:
When starting a row operation (insert/update/delete), mark that
the bitmap is not flushable (because for example INSERT is going
to over-allocate in the bitmap to prevent other threads from using
our data pages). If a checkpoint comes at this moment it will wait
for the bitmap to be flushable before flushing it.
When the operation ends, bitmap becomes flushable again; that
transition is done under the bitmap's mutex (needed for correct
synchro with a concurrent checkpoint); but for INSERT/UPDATE this
happens inside _ma_bitmap_release_unused() at a place where it already
has the mutex, so the only penalty (mutex adding) is in DELETE and UNDO
of INSERT. In case of errors after setting the bitmap unflushable,
we must always set it back to flushable or checkpoint would block.
Debug possibilities to force a sleep while the bitmap is over-allocated.
In case of error in get_head_or_tail() in allocate_and_write_block_record(),
we still need to unpin all pages.
Bugfix: _ma_apply_redo_insert_row_blobs() produced wrong
data_file_length.
storage/maria/ma_blockrec.h:
new bitmap calls.
storage/maria/ma_checkpoint.c:
filter_flush_indirect not needed anymore (flushing bitmap
pages happens in _ma_bitmap_flush_all() now). So
st_filter_param::is_data_file|pages_covered_by_bitmap not needed.
Other filter_flush* don't need to flush bitmap anymore.
Add debug possibility to flush all bitmap pages outside of a checkpoint,
to simulate pagecache LRU eviction.
When the background flush/checkpoint thread notices it has nothing
to flush, it now sleeps directly until the next potential checkpoint
moment instead of waking up every second.
When in checkpoint we decide to not store a table in the checkpoint record
(because it has logged no writes for example), we can also skip flushing
this table.
storage/maria/ma_commit.c:
comment is out-of-date
storage/maria/ma_key_recover.c:
comment fix
storage/maria/ma_loghandler.c:
comment is out-of-date
storage/maria/ma_open.c:
comment is out-of-date
storage/maria/ma_pagecache.c:
comment for bug to fix. And we don't take checkpoints at end of REDO
phase yet so can trust block->type.
storage/maria/ma_recovery.c:
Comments. Now-unneeded code for incomplete REDO-UNDO groups removed.
When we forget about an old transaction we must really forget
about it with bzero() (fixes the "long_trid!=0 assertion" recovery
bug). When we delete a row with maria_delete() we turn on
STATE_NOT_OPTIMIZED_ROWS so we do the same when we see a CLR_END
for an UNDO_ROW_INSERT or when we execute an UNDO_ROW_INSERT (in both
cases a row was deleted). Pick up max_long_trid from the checkpoint record.
storage/maria/maria_chk.c:
comment
storage/maria/maria_def.h:
MARIA_FILE_BITMAP gets new members: 'flushable', 'bitmap_cond' and
'pinned_pages'.
storage/maria/trnman.c:
I used to think that recovery only needs to know the maximum TrID
of the lists of active and committed transactions. But no, sometimes
both lists can even be empty and their TrID should not be reused.
So Checkpoint now saves global_trid_generator in the checkpoint record.
storage/maria/trnman_public.h:
macros to read/store a TrID
mysql-test/r/maria-recovery-bitmap.result:
result is ok. Without the code fix, we would get a corruption message
about the bitmap page in CHECK TABLE EXTENDED.
mysql-test/t/maria-recovery-bitmap-master.opt:
usual when we crash mysqld in tests
mysql-test/t/maria-recovery-bitmap.test:
test of recovery problems specific of the bitmap pages.
into desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-testfail
mysql-test/t/maria-recovery.test:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
switching to new one which prevent deadlock.
mysql-test/r/maria-purge.result:
Fixed test which use setting maria_checkpoint_interval to force
checkpoint now.
mysql-test/t/maria-purge.test:
Fixed test which use setting maria_checkpoint_interval to force
checkpoint now.
mysql-test/r/maria-big.result:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/r/maria-connect.result:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/r/maria-purge.result:
Change to make maria-purge more stable.
mysql-test/r/maria.result:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/r/ps_maria.result:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/t/maria-big.test:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/t/maria-connect.test:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/t/maria-purge.test:
Change to make maria-purge more stable.
mysql-test/t/maria-recovery.test:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/t/maria.test:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
mysql-test/t/ps_maria.test:
Change to make maria-purge more stable: increasing file size
to let all records fit in one log.
into mysql.com:/home/my/mysql-maria
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
Cleanup of recent code changes in dbug and my_thr_init
Added name for each safe_mutex (for better DBUG and error reporting)
Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk
Removed duplicate printing of mutex address in dbug log
dbug/dbug.c:
Cleanup of recent code changes
include/my_pthread.h:
Added name for each safe_mutex (for better DBUG and error reporting)
mysys/my_thr_init.c:
Cleanup of recent code changes
mysys/thr_mutex.c:
Added name for each safe_mutex (for better DBUG and error reporting)
mysys/wqueue.c:
Removed some mutex printing (as it's done now when we take mutex)
storage/maria/Makefile.am:
Fixed that 'make tags' works with xemacs
storage/maria/ma_blockrec.c:
base.min_row_length -> base.min_block_length
(As they where basicly the same variable)
storage/maria/ma_check.c:
Moved more common stuff to initialize_variables_for_repair
Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk
storage/maria/ma_create.c:
More comments
Fixed that min_pack_length is calculated more correctly
Removed duplicate variable base.min_row_length
storage/maria/ma_loghandler.c:
Removed duplicate printing of mutex address
storage/maria/ma_open.c:
Removed base.min_row_length
storage/maria/ma_packrec.c:
Removed not anymore needed code
(One should not change any .base variables as this will affect repair with unpack)
storage/maria/maria_def.h:
Removed base.min_row_length
