diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-04-28 18:02:26 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-04-28 18:02:26 +0300 |
| commit | 6da8ac5f71a6501cb0fb1304ff144ec41b4d9389 (patch) | |
| tree | 25fd264f65836fd6fb0cd183dc670d34ac4b3c37 /mysql-test/r/flush.result | |
| parent | 24edac2211c46ea9ebeb4a13bc467fb20008916e (diff) | |
| download | mariadb-git-6da8ac5f71a6501cb0fb1304ff144ec41b4d9389.tar.gz | |
Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"
This makes it possible to do safe multi volume snapshots as long as one snapshots the volume with the transaction logs last.
include/mysql_com.h:
Added REFRESH_CHECKPOINT
mysql-test/r/flush.result:
Added test of new FLUSH TABLES syntax + calls to checkpoint_status handler calls
mysql-test/t/flush.test:
Added test of new FLUSH TABLES syntax + calls to checkpoint_status handler calls
sql/handler.cc:
Added code to call checkpoint_state for all handlertons that supports it
sql/handler.h:
Added new checkpoint_state() handlerton call to temporarly disable checkpoints.
sql/lex.h:
Added CHECKPOINT keyword
sql/sql_yacc.yy:
Added support for FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT
storage/maria/ha_maria.cc:
Added handlerton call to disable checkpoints.
storage/maria/ma_checkpoint.c:
Don't do checkpoint if checkpoints are disabled.
storage/maria/ma_static.c:
Added maria_checkpoint_disabled
storage/maria/maria_def.h:
Added maria_checkpoint_disabled
storage/xtradb/handler/ha_innodb.cc:
Added handlerton call to disable checkpoints.
storage/xtradb/include/log0log.h:
Added option to log_checkpoint() to allow one to ignore not critical checkpoints during the time checkpoints are disabled.
storage/xtradb/log/log0log.c:
Added code to allow one to disable checkpoints during a FLUSH TABLES ... DISABLE CHECKPOINT
This was done by adding a new argument to log_checkpoint() which tells us when the checkpoint is called by srv_master_thread (which are safe to ignore)
storage/xtradb/srv/srv0srv.c:
Tell log_checkpoint() that checkpoints from srv_master_thread() are safe to ignore (will just delay recovery time a bit).
Diffstat (limited to 'mysql-test/r/flush.result')
| -rw-r--r-- | mysql-test/r/flush.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result index b978304f59d..d575346a140 100644 --- a/mysql-test/r/flush.result +++ b/mysql-test/r/flush.result @@ -6,7 +6,7 @@ insert into t2 values(3); select * from t1; n 3 -flush tables with read lock; +flush tables with read lock and disable checkpoint; drop table t2; ERROR HY000: Can't execute the query because you have a conflicting read lock drop table t2; |