diff options
| author | unknown <monty@narttu.mysql.fi> | 2008-01-10 21:26:09 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2008-01-10 21:26:09 +0200 |
| commit | 674f0198c3c099a2e9ea899b46d9592d8844d499 (patch) | |
| tree | 76e19485e760f5e9df60f77f9f6caf4d64890501 /storage/maria/ma_create.c | |
| parent | 65395ead814014c3c1163c3a89a659ea85bfa106 (diff) | |
| parent | 5ad477f6cb765025ce240a47b71532bb7e5f286b (diff) | |
| download | mariadb-git-674f0198c3c099a2e9ea899b46d9592d8844d499.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
sql/mysqld.cc:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_recovery.c:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/maria_pack.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
storage/maria/ha_maria.cc:
Manual (trival) merge
Diffstat (limited to 'storage/maria/ma_create.c')
| -rw-r--r-- | storage/maria/ma_create.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 31c62bb8d78..af8fe06f0ee 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -632,7 +632,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, my_errno=HA_WRONG_CREATE_OPTION; goto err_no_lock; } - keydef->block_length= maria_block_size; + keydef->block_length= (uint16) maria_block_size; keydef->keylength= (uint16) key_length; keydef->minlength= (uint16) min_key_length; keydef->maxlength= (uint16) length; @@ -1007,12 +1007,12 @@ int maria_create(const char *name, enum data_file_type datafile_type, uint k; LSN lsn; log_array[TRANSLOG_INTERNAL_PARTS + 1].length= 1 + 2 + 2 + - kfile_size_before_extension; + (uint) kfile_size_before_extension; /* we are needing maybe 64 kB, so don't use the stack */ log_data= my_malloc(log_array[TRANSLOG_INTERNAL_PARTS + 1].length, MYF(0)); if ((log_data == NULL) || - my_pread(file, 1 + 2 + 2 + log_data, kfile_size_before_extension, - 0, MYF(MY_NABP))) + my_pread(file, 1 + 2 + 2 + log_data, + (size_t) kfile_size_before_extension, 0, MYF(MY_NABP))) goto err; /* remember if the data file was created or not, to know if Recovery can |