diff options
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/os/os0file.c | 2 | ||||
| -rw-r--r-- | innobase/srv/srv0srv.c | 4 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 2 | ||||
| -rw-r--r-- | innobase/trx/trx0sys.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index be57868e574..fe5b4f9c096 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -428,7 +428,7 @@ os_file_handle_error_no_exit( return (FALSE); } - return(FALSE); + return(FALSE); /* not reached */ } /******************************************************************** diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 9987804f03e..1f709025759 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -995,7 +995,7 @@ srv_console( srv_dec_thread_count(SRV_CONSOLE); } - return(0); + return(0); /* Not reached */ } /************************************************************************* @@ -3286,7 +3286,7 @@ suspend_thread: os_thread_exit(NULL); #ifndef __WIN__ - return(NULL); + return(NULL); /* Not reached */ #else return(0); #endif diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index 3f375b66c4f..69ddaec0619 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -441,7 +441,7 @@ io_handler_thread( os_thread_exit(NULL); #ifndef __WIN__ - return(NULL); + return(NULL); /* Not reached */ #else return(0); #endif diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c index 89412003485..177c5db7413 100644 --- a/innobase/trx/trx0sys.c +++ b/innobase/trx/trx0sys.c @@ -589,7 +589,7 @@ trx_sys_update_mysql_binlog_offset( mlog_write_string(sys_header + field + TRX_SYS_MYSQL_LOG_NAME, - file_name, 1 + ut_strlen(file_name), mtr); + (byte*) file_name, 1 + ut_strlen(file_name), mtr); } if (mach_read_from_4(sys_header + field |