diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-11-20 02:48:09 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-11-20 02:48:09 +0200 |
| commit | 46401ab3842d29281161ddb4204d2f2959b8fbc7 (patch) | |
| tree | 0a61e2dc180694c077416cd962cb3c948144686d /innobase | |
| parent | 29b99eaa0d91952a69839027396f64058e885b58 (diff) | |
| download | mariadb-git-46401ab3842d29281161ddb4204d2f2959b8fbc7.tar.gz | |
Portability fixes for AIX43
include/my_base.h:
Portability fix
include/my_global.h:
Portability fix for AIX43
(Having _Export gave a lot of errors/warnings and I think this is not needed anymore)
include/my_sys.h:
Remove compiler warning on AIX43 with xlc_r compiler
include/mysql.h:
Portability fix
innobase/fil/fil0fil.c:
Fixed compiler warnings (xlc_r)
libmysql/libmysql.c:
Portability fix
strings/my_strtoll10.c:
Portability fix (for AIX43)
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/fil/fil0fil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index a9ae59fbd50..7cf3cc409b3 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -1567,7 +1567,7 @@ fil_op_write_log( mlog_close(mtr, log_ptr); - mlog_catenate_string(mtr, name, ut_strlen(name) + 1); + mlog_catenate_string(mtr, (byte*) name, ut_strlen(name) + 1); if (type == MLOG_FILE_RENAME) { log_ptr = mlog_open(mtr, 30); @@ -1576,7 +1576,7 @@ fil_op_write_log( mlog_close(mtr, log_ptr); - mlog_catenate_string(mtr, new_name, ut_strlen(new_name) + 1); + mlog_catenate_string(mtr, (byte*) new_name, ut_strlen(new_name) + 1); } } #endif @@ -1630,7 +1630,7 @@ fil_op_log_parse_or_replay( return(NULL); } - name = ptr; + name = (char*) ptr; ptr += name_len; @@ -1649,7 +1649,7 @@ fil_op_log_parse_or_replay( return(NULL); } - new_name = ptr; + new_name = (char*) ptr; ptr += new_name_len; } |