diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 18:26:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 18:26:22 +0200 |
| commit | e0a08c567a028db406ebf69ece8b3210cba2af0c (patch) | |
| tree | 4e5655ebc320dc033ab2936086945a22edff12f4 | |
| parent | b381cf843c841151f96541b19bd753cd3bbae326 (diff) | |
| download | mariadb-git-e0a08c567a028db406ebf69ece8b3210cba2af0c.tar.gz | |
Compilation warnings.
openssl compilation problem.
| -rw-r--r-- | storage/maria/ma_loghandler.c | 3 | ||||
| -rw-r--r-- | storage/maria/ma_search.c | 10 | ||||
| -rw-r--r-- | storage/xtradb/os/os0file.c | 3 | ||||
| -rw-r--r-- | vio/viossl.c | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 341bbc6088f..54f67eb1ab3 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -7472,9 +7472,8 @@ static void translog_force_current_buffer_to_finish() struct st_translog_buffer *old_buffer= log_descriptor.bc.buffer; uchar *data= log_descriptor.bc.ptr - log_descriptor.bc.current_page_fill; uint16 left= TRANSLOG_PAGE_SIZE - log_descriptor.bc.current_page_fill; - uint16 current_page_fill, write_counter, previous_offset; + uint16 UNINIT_VAR(current_page_fill), write_counter, previous_offset; DBUG_ENTER("translog_force_current_buffer_to_finish"); - LINT_INIT(current_page_fill); DBUG_PRINT("enter", ("Buffer #%u 0x%lx " "Buffer addr: (%lu,0x%lx) " diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c index ccb4bf77717..d38bc7af26c 100644 --- a/storage/maria/ma_search.c +++ b/storage/maria/ma_search.c @@ -424,9 +424,9 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, flag is the value returned by ha_key_cmp and as treated as final */ int flag=0, my_flag=-1; - uint nod_flag, length, len, matched, cmplen, kseg_len; - uint page_flag, prefix_len,suffix_len; - int key_len_skip, seg_len_pack, key_len_left; + uint nod_flag, UNINIT_VAR(length), len, matched, cmplen, kseg_len; + uint page_flag, UNINIT_VAR(prefix_len),suffix_len; + int key_len_skip, UNINIT_VAR(seg_len_pack), key_len_left; uchar *end, *vseg, *UNINIT_VAR(saved_vseg), *UNINIT_VAR(saved_from); uchar *page; uchar tt_buff[MARIA_MAX_KEY_BUFF+2], *t_buff=tt_buff+2; @@ -439,10 +439,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page, const uchar *sort_order= keyinfo->seg->charset->sort_order; DBUG_ENTER("_ma_prefix_search"); - LINT_INIT(seg_len_pack); - LINT_INIT(prefix_len); - LINT_INIT(length); - t_buff[0]=0; /* Avoid bugs */ page_flag= ma_page->flag; nod_flag= ma_page->node; diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c index 8f1b3e46bb2..8f7f8216782 100644 --- a/storage/xtradb/os/os0file.c +++ b/storage/xtradb/os/os0file.c @@ -1462,7 +1462,6 @@ os_file_set_nocache( #endif static int os_file_set_atomic_writes(os_file_t file, const char *name) { - static int first_time = 1; int atomic_option = 1; int ret = ioctl (file, DFS_IOCTL_ATOMIC_WRITE_SET, &atomic_option); @@ -2138,7 +2137,7 @@ os_file_set_size( "InnoDB: Error: preallocating data for" " file %s failed at\n" "InnoDB: offset 0 size %lld %lld. Operating system" - " error number %llu.\n" + " error number %d.\n" "InnoDB: Check that the disk is not full" " or a disk quota exceeded.\n" "InnoDB: Some operating system error numbers" diff --git a/vio/viossl.c b/vio/viossl.c index 88f23df6842..ad20a6ab5c3 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -183,7 +183,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, SSL_clear(ssl); SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); SSL_set_fd(ssl, vio->sd); -#ifndef HAVE_YASSL +#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION) SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); #endif |