diff options
| author | unknown <guilhem@gbichot4.local> | 2008-01-01 22:30:49 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-01-01 22:30:49 +0100 |
| commit | 98aad88f4d2d1baef97e9be4d26da0e850d121bc (patch) | |
| tree | b450fcce86fbf6a6ff506a6de82e98f3867233c0 /mysql-test/include/maria_empty_logs.inc | |
| parent | a9c9364c2827087ecaeb14c3fb7adc7a4a9fbbe5 (diff) | |
| download | mariadb-git-98aad88f4d2d1baef97e9be4d26da0e850d121bc.tar.gz | |
after-merge fixes and comments
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
Diffstat (limited to 'mysql-test/include/maria_empty_logs.inc')
| -rw-r--r-- | mysql-test/include/maria_empty_logs.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/maria_empty_logs.inc b/mysql-test/include/maria_empty_logs.inc index 64ea9e7a47e..1849eaf82a2 100644 --- a/mysql-test/include/maria_empty_logs.inc +++ b/mysql-test/include/maria_empty_logs.inc @@ -17,6 +17,7 @@ if (!$mel_keep_control_file) { remove_file $MYSQLTEST_VARDIR/master-data/maria_log_control; } +-- error 0,1 remove_file $MYSQLTEST_VARDIR/master-data/maria_log.00000001; -- error 0,1 remove_file $MYSQLTEST_VARDIR/master-data/maria_log.00000002; |