mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After merge fixes

Browse source 
BitKeeper/etc/ignore:
  added storage/maria/maria_read_log
support-files/compiler_warnings.supp:
  Ignore function used when debugging (can be called from gdb)
This commit is contained in:
unknown 2007-07-01 20:45:01 +03:00
parent e2904e77f1
commit ef7a757b7c
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.bzrignore
View file

@ -3001,3 +3001,4 @@ storage/maria/unittest/ma_pagecache_single_64k-t-big
storage/maria/maria_control storage/maria/maria_control
storage/maria/maria_log.* storage/maria/maria_log.*
storage/maria/unittest/ma_test_loghandler_long-t-big storage/maria/unittest/ma_test_loghandler_long-t-big
storage/maria/maria_read_log

1
storage/maria/ma_delete_all.c
View file

@ -142,6 +142,7 @@ void _ma_reset_status(MARIA_HA *info)
info->state->data_file_length= 0; info->state->data_file_length= 0;
info->state->empty= info->state->key_empty= 0; info->state->empty= info->state->key_empty= 0;
info->state->checksum= 0; info->state->checksum= 0;
share->state.create_rename_lsn= LSN_IMPOSSIBLE;
/* Drop the delete key chain. */ /* Drop the delete key chain. */
state->key_del= HA_OFFSET_ERROR; state->key_del= HA_OFFSET_ERROR;

2
storage/maria/maria_read_log.c
View file

@ -521,7 +521,7 @@ prototype_exec_hook(REDO_CREATE_TABLE)
data file does not preclude this). data file does not preclude this).
*/ */
if (((info= maria_open(name, O_RDONLY, 0)) == NULL) || 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"); fprintf(stderr, "Failed to open new table or write to data file\n");
goto err; goto err;

5
support-files/compiler_warnings.supp
View file

@ -54,6 +54,11 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.*
.*/ndb/.* : .*unused variable.* .*/ndb/.* : .*unused variable.*
.*/ndb/.* : .*defined but not used.* .*/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 # Unexplanable (?) stuff
# #