diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-07-01 20:45:01 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-07-01 20:45:01 +0300 |
| commit | ef7a757b7c09f65207e6f30619a32533c27f400f (patch) | |
| tree | 32a538341c0fb8ddd0669982479ed262189e95f3 /storage | |
| parent | e2904e77f1803b00615e00caef5c057c36c10b86 (diff) | |
| download | mariadb-git-ef7a757b7c09f65207e6f30619a32533c27f400f.tar.gz | |
After merge fixes
BitKeeper/etc/ignore:
added storage/maria/maria_read_log
support-files/compiler_warnings.supp:
Ignore function used when debugging (can be called from gdb)
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ma_delete_all.c | 1 | ||||
| -rw-r--r-- | storage/maria/maria_read_log.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_delete_all.c b/storage/maria/ma_delete_all.c index 846006787fe..c3bdcdf365c 100644 --- a/storage/maria/ma_delete_all.c +++ b/storage/maria/ma_delete_all.c @@ -142,6 +142,7 @@ void _ma_reset_status(MARIA_HA *info) info->state->data_file_length= 0; info->state->empty= info->state->key_empty= 0; info->state->checksum= 0; + share->state.create_rename_lsn= LSN_IMPOSSIBLE; /* Drop the delete key chain. */ state->key_del= HA_OFFSET_ERROR; diff --git a/storage/maria/maria_read_log.c b/storage/maria/maria_read_log.c index 568814f6f8a..5b2d5b057c2 100644 --- a/storage/maria/maria_read_log.c +++ b/storage/maria/maria_read_log.c @@ -521,7 +521,7 @@ prototype_exec_hook(REDO_CREATE_TABLE) data file does not preclude this). */ if (((info= maria_open(name, O_RDONLY, 0)) == NULL) || - _ma_initialize_data_file(dfile, info->s)) + _ma_initialize_data_file(info->s, dfile)) { fprintf(stderr, "Failed to open new table or write to data file\n"); goto err; |