diff options
| author | Michael Widenius <monty@mysql.com> | 2008-08-25 14:49:47 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-08-25 14:49:47 +0300 |
| commit | 1a5de5bc82cee3c2411862b8ef32588b530a780f (patch) | |
| tree | 2baced329239d24a26baaa76e655f5c457d9dcbf /storage/maria/ma_locking.c | |
| parent | d145362edf0c6c640b46eb08db18e2781d128075 (diff) | |
| download | mariadb-git-1a5de5bc82cee3c2411862b8ef32588b530a780f.tar.gz | |
Changed all file names in maria to LEX_STRING and removed some calls to strlen()
Ensure that pagecache gives correct error number even if error for block happend
mysys/my_pread.c:
Indentation fix
storage/maria/ha_maria.cc:
filenames changed to be of type LEX_STRING
storage/maria/ma_check.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_checkpoint.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_create.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_dbug.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_delete.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_info.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_keycache.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_locking.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_loghandler.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_open.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_pagecache.c:
Store error number for last failed operation in the page block
This should fix some asserts() when errno was not properly set after failure to read block in another thread
storage/maria/ma_recovery.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_update.c:
filenames changed to be of type LEX_STRING
storage/maria/ma_write.c:
filenames changed to be of type LEX_STRING
storage/maria/maria_def.h:
filenames changed to be of type LEX_STRING
storage/maria/maria_ftdump.c:
filenames changed to be of type LEX_STRING
storage/maria/maria_pack.c:
filenames changed to be of type LEX_STRING
Diffstat (limited to 'storage/maria/ma_locking.c')
| -rw-r--r-- | storage/maria/ma_locking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_locking.c b/storage/maria/ma_locking.c index 4ddfa285d37..1ad41e5b213 100644 --- a/storage/maria/ma_locking.c +++ b/storage/maria/ma_locking.c @@ -34,7 +34,7 @@ int maria_lock_database(MARIA_HA *info, int lock_type) lock_type, info->lock_type, share->r_locks, share->w_locks, share->global_changed, share->state.open_count, - share->index_file_name)); + share->index_file_name.str)); if (share->options & HA_OPTION_READ_ONLY_DATA || info->lock_type == lock_type) DBUG_RETURN(0); |