Fixed test failure under heavy load, in case truncate table is slow.
mysql-test/r/events_logs_tests.result:
Fixed test failure under heavy load, in case truncate table is slow.
mysql-test/t/events_logs_tests.test:
Fixed test failure under heavy load, in case truncate table is slow.
the first query is not running while we are doing wait queries on
a second connection.
mysql-test/r/sp.result:
Remove test case result for Bug#29936, moving to sp_notembedded.result
mysql-test/r/sp_notembedded.result:
Test case result for Bug#29936, moved from sp.result
mysql-test/t/sp.test:
Remove test case for Bug#29936, moving to sp_notembedded.test
mysql-test/t/sp_notembedded.test:
Test case result for Bug#29936, moved from sp.test
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
client/mysqldump.c:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/Makefile.am:
Add install data for new test case
storage/ndb/tools/restore/Restore.cpp:
Convert blob(text) length stored in main table
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log:
test data for endian test
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result:
test result for endian test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test:
test case for endian test
- problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
- point to table map instead?
- or copy it?
- or make sure that anything interacting with the share happens _after_ the epoch
Problem with flush is that STMT_END_F may not be included as it shoudld...
mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
and during the restoration from this dump events were created in spite
of the --skip-events option.
The mysqldump client has been modified to ignore mysql.event table data
in case of --skip-events options.
client/mysqldump.c:
Fixed bug #29938.
The dump_table function has been modified to skip dumping of
the mysql.event table data in case of the --skip-event mysqldump
client option.
mysql-test/t/mysqldump.test:
Updated test case for bug #29938.
mysql-test/r/mysqldump.result:
Updated test case for bug #29938.
Added part of undo of update row
Extended ma_test1 for recovery testing
Some bug fixes
storage/maria/ha_maria.cc:
Ignore 'state.split' in case of block records
storage/maria/ma_bitmap.c:
Added return value for _ma_bitmap_find_place() for how much data we should put on head page
storage/maria/ma_blockrec.c:
Added undo of deleted row.
- Added logging of CLR_END records in write_block_record()
- Split ma_write_init_block_record() to two functions to get better code reuse
- Added _ma_apply_undo_row_delete()
- Added ma_get_length()
Added 'empty' prototype for undo_row_update()
Fixed bug when moving data withing a head/tail page.
Fixed bug when reading a page with bigger LSN but of different type than was expected.
Store undo_lsn first in CLR_END record
Simplified some code by adding local variables.
Changed log format for UNDO_ROW_DELETE to store total length of used blobs
storage/maria/ma_blockrec.h:
Added prototypes for undo code.
storage/maria/ma_pagecache.c:
Allow plain page to change to LSN page (needed in recovery to apply UNDO)
storage/maria/ma_recovery.c:
Added undo handling of UNDO_ROW_DELETE and UNDO_ROW_UPDATE
storage/maria/ma_test1.c:
Extended --test-undo option to allow us to die after insert or after delete.
Fixed bug in printing key values when using -v
storage/maria/maria_def.h:
Moved some variables around to be getter alignment
Added length_buff buffer to be used during undo handling
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
Small fixes made.
storage/maria/ma_loghandler.c:
Check of transaction log descriptor table consistance added.\
Incorrect record description fixed.
Compiler warning fixed.
storage/maria/ma_loghandler.h:
fixed ident.
storage/maria/unittest/ma_test_loghandler-t.c:
Suppressing of automatic record writing
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
Suppressing of automatic record writing
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
Suppressing of automatic record writing
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
Suppressing of automatic record writing
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
Suppressing of automatic record writing
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
Suppressing of automatic record writing
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
Suppressing of automatic record writing
storage/maria/unittest/ma_test_loghandler_purge-t.c:
Suppressing of automatic record writing
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
configure.in:
Auto merged
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
Auto merged
BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308:
Auto merged
BitKeeper/deleted/.del-pack.c~4754cd15e3058c75:
Auto merged
BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7:
Auto merged
BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/include/have_bug25714.inc:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
configure.in:
null-merge
BitKeeper/deleted/.del-net_serv.cc:
Auto merged
BitKeeper/deleted/.del-pack.c:
Auto merged
BitKeeper/deleted/.del-password.c:
Auto merged
BitKeeper/deleted/.del-sql_state.c:
Auto merged
storage/maria/ma_blockrec.c:
Added UNDO handling of insert during recovery
To do this, I also had to add write locking of tail pages during undo phase (As we need to access the same page twice if extents are split over two pages)
Another way to handle the undo of insert would be to store the extent information as part of the UNDO_INSERT block.
storage/maria/ma_blockrec.h:
Added new prototype
storage/maria/ma_loghandler.c:
Changed type of CLR_END (to avoid crash in log handler)
Removed not used variable
storage/maria/ma_loghandler.h:
Added TRN argument to record_execute_in_undo_phase()
storage/maria/ma_pagecache.c:
Hack for undo phase of recovery. During REDO we work with PLAIN pages, but UNDO works with LSN pages, which caused an abort when trying to access a cached page.
storage/maria/ma_recovery.c:
Added execution of UNDO_ROW_INSERT
storage/maria/ma_test1.c:
Added option --test-undo for testing recovery with undo
storage/maria/maria_read_log.c:
Added processing of undos
