Commit ef7a757b authored by unknown's avatar unknown

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)
parent e2904e77
......@@ -3001,3 +3001,4 @@ storage/maria/unittest/ma_pagecache_single_64k-t-big
storage/maria/maria_control
storage/maria/maria_log.*
storage/maria/unittest/ma_test_loghandler_long-t-big
storage/maria/maria_read_log
......@@ -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;
......
......@@ -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;
......
......@@ -54,6 +54,11 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.*
.*/ndb/.* : .*unused variable.*
.*/ndb/.* : .*defined but not used.*
#
# Maria warning that is ok in debug builds
#
storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used
#
# Unexplanable (?) stuff
#
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment